chore: remove 'SelfContained'

Signed-off-by: Norman <norman@samourai.coop>

Author: n0izn0iz

examples/no_cycles_test.go

@@ -24,7 +24,7 @@ var injectedTestingLibs = []string{"encoding/json", "fmt", "os", "internal/os_te
 // TestNoCycles checks that there is no import cycles in stdlibs and non-draft examples
 func TestNoCycles(t *testing.T) {
 	// find examples and stdlibs
-	cfg := &packages.LoadConfig{SelfContained: true, Deps: true, Fetcher: pkgdownload.NewNoopFetcher()}
+	cfg := &packages.LoadConfig{Deps: true, Fetcher: pkgdownload.NewNoopFetcher()}
 	pkgs, err := packages.Load(cfg, filepath.Join(gnoenv.RootDir(), "examples", "..."))
 	require.NoError(t, err)
 

gno.land/cmd/gnoland/start.go

@@ -426,7 +426,7 @@ func generateGenesisFile(io commands.IO, genesisFile string, privKey crypto.Priv
 
 	// Load examples folder
 	examplesDir := filepath.Join(c.gnoRootDir, "examples")
-	loadCfg := &packages.LoadConfig{IO: io, SelfContained: true}
+	loadCfg := &packages.LoadConfig{IO: io}
 	pkgsTxs, err := gnoland.LoadPackagesFromDir(loadCfg, examplesDir, txSender, genesisDeployFee)
 	if err != nil {
 		return fmt.Errorf("unable to load examples folder: %w", err)

gno.land/pkg/integration/node_testing.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
 	"github.com/gnolang/gno/gno.land/pkg/gnoland/ugnot"
-	"github.com/gnolang/gno/gnovm/pkg/packages"
 	abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
 	tmcfg "github.com/gnolang/gno/tm2/pkg/bft/config"
 	"github.com/gnolang/gno/tm2/pkg/bft/node"
@@ -136,8 +135,7 @@ func LoadDefaultPackages(t TestingTS, creator bft.Address, gnoroot string) []gno
 	examplesDir := filepath.Join(gnoroot, "examples")
 
 	defaultFee := std.NewFee(50000, std.MustParseCoin(ugnot.ValueString(1000000)))
-	cfg := &packages.LoadConfig{SelfContained: true}
-	txs, err := gnoland.LoadPackagesFromDir(cfg, examplesDir, creator, defaultFee)
+	txs, err := gnoland.LoadPackagesFromDir(nil, examplesDir, creator, defaultFee)
 	require.NoError(t, err)
 
 	return txs

gno.land/pkg/integration/pkgloader.go

@@ -88,8 +88,7 @@ func (pl *PkgsLoader) LoadPackages(creatorKey crypto.PrivKey, fee std.Fee, depos
 
 func (pl *PkgsLoader) LoadAllPackagesFromDir(path string) error {
 	// list all packages from target path
-	cfg := &packages.LoadConfig{SelfContained: true}
-	pkgslist, err := packages.Load(cfg, filepath.Join(path, "..."))
+	pkgslist, err := packages.Load(nil, filepath.Join(path, "..."))
 	if err != nil {
 		return fmt.Errorf("listing gno packages: %w", err)
 	}
@@ -105,7 +104,7 @@ func (pl *PkgsLoader) LoadAllPackagesFromDir(path string) error {
 
 func (pl *PkgsLoader) LoadPackage(pkgDir string, name string) error {
 	examples := filepath.Join(gnoenv.RootDir(), "examples", "...")
-	cfg := &packages.LoadConfig{Deps: true, SelfContained: true, DepsPatterns: []string{examples}}
+	cfg := &packages.LoadConfig{Deps: true, DepsPatterns: []string{examples}}
 	pkgs, err := packages.Load(cfg, pkgDir)
 	if err != nil {
 		return fmt.Errorf("%q: loading: %w", pkgDir, err)

gnovm/cmd/gno/mod.go

@@ -352,7 +352,7 @@ func execModWhy(args []string, io commands.IO) error {
 		return flag.ErrHelp
 	}
 
-	conf := &packages.LoadConfig{SelfContained: true, Fetcher: testPackageFetcher}
+	conf := &packages.LoadConfig{Fetcher: testPackageFetcher}
 	pkgs, err := packages.Load(conf, ".")
 	if err != nil {
 		return err

gnovm/pkg/packages/expand_patterns.go

@@ -90,12 +90,6 @@ func expandPatterns(conf *LoadConfig, patterns ...string) ([]*pkgMatch, error) {
 		switch patKind {
 		case patternKindRecursiveRemote:
 			return nil, fmt.Errorf("%s: recursive remote patterns are not supported", match)
-
-		case patternKindRemote:
-			// XXX: weird
-			if conf.SelfContained {
-				return nil, fmt.Errorf("%s: remote patterns are not supported in self-contained mode", match)
-			}
 		case patternKindSingleFile:
 			return nil, fmt.Errorf("unexpected single pattern at this point")
 		}

gnovm/pkg/packages/load.go

@@ -22,14 +22,13 @@ import (
 // FIXME: should not include pkgs imported in test except for matches and only when Test flag is set
 
 type LoadConfig struct {
-	IO            commands.IO
-	Fetcher       pkgdownload.PackageFetcher
-	Deps          bool
-	Cache         PkgList
-	SelfContained bool
-	AllowEmpty    bool
-	DepsPatterns  []string
-	Fset          *token.FileSet
+	IO           commands.IO
+	Fetcher      pkgdownload.PackageFetcher
+	Deps         bool
+	Cache        PkgList
+	AllowEmpty   bool
+	DepsPatterns []string
+	Fset         *token.FileSet
 }
 
 var injectedTestingLibs = []string{"encoding/json", "fmt", "internal/os_test", "os"}
@@ -161,14 +160,6 @@ func Load(conf *LoadConfig, patterns ...string) (PkgList, error) {
 				continue
 			}
 
-			if conf.SelfContained {
-				pkg.Errors = append(pkg.Errors, &Error{
-					Pos: pkg.Dir,
-					Msg: fmt.Sprintf("package %q not found (self-contained)", imp.PkgPath),
-				})
-				continue
-			}
-
 			dir := gnomod.PackageDir("", module.Version{Path: imp.PkgPath})
 			if err := downloadPackage(conf, imp.PkgPath, dir); err != nil {
 				pkg.Errors = append(pkg.Errors, &Error{

gnovm/pkg/packages/load_test.go

@@ -169,9 +169,8 @@ func TestSortPkgs(t *testing.T) {
 func TestLoadNonDraftExamples(t *testing.T) {
 	examples := filepath.Join("..", "..", "..", "examples", "...")
 	conf := LoadConfig{
-		Deps:          true,
-		Fetcher:       pkgdownload.NewNoopFetcher(),
-		SelfContained: true,
+		Deps:    true,
+		Fetcher: pkgdownload.NewNoopFetcher(),
 	}
 
 	pkgs, err := Load(&conf, examples)