rename pkgName to pkgPath

gnolang · Jul 4, 2023 · b90c4fb · b90c4fb
1 parent efa19d1
commit b90c4fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/gnovm/cmd/gno/build.go b/gnovm/cmd/gno/build.go
@@ -57,7 +57,7 @@ func execBuild(cfg *buildCfg, args []string, io *commands.IO) error {
 		return flag.ErrHelp
 	}
 
-	paths, err := gnoPackagePathsFromArgs(args)
+	paths, err := gnoPackagesFromArgs(args)
 	if err != nil {
 		return fmt.Errorf("list packages: %w", err)
 	}

diff --git a/gnovm/cmd/gno/test.go b/gnovm/cmd/gno/test.go
@@ -134,7 +134,7 @@ func execTest(cfg *testCfg, args []string, io *commands.IO) error {
 		cfg.rootDir = guessRootDir()
 	}
 
-	pkgPaths, err := gnoPackagePathsFromArgs(args)
+	pkgPaths, err := gnoPackagesFromArgs(args)
 	if err != nil {
 		return fmt.Errorf("list packages from args: %w", err)
 	}
@@ -226,7 +226,7 @@ func execTest(cfg *testCfg, args []string, io *commands.IO) error {
 }
 
 func gnoTestPkg(
-	pkgPath string,
+	pkgDir string,
 	unittestFiles,
 	filetestFiles []string,
 	cfg *testCfg,
@@ -266,16 +266,15 @@ func gnoTestPkg(
 
 	// testing with *_test.gno
 	if len(unittestFiles) > 0 {
-		// TODO not pkgName, bc it's usually the last part of the pkgPath
-		pkgName := strings.TrimPrefix(pkgPath, "./examples/")
-		memPkg := gno.ReadMemPackage(pkgPath, pkgName)
+		pkgPath := strings.TrimPrefix(pkgDir, "./examples/")
+		memPkg := gno.ReadMemPackage(pkgDir, pkgPath)
 
 		// tfiles, ifiles := gno.ParseMemPackageTests(memPkg)
 		tfiles, ifiles := parseMemPackageTests(memPkg)
 
 		// run test files in pkg
 		{
-			m := tests.TestMachine(testStore, stdout, pkgName)
+			m := tests.TestMachine(testStore, stdout, pkgPath)
 			if printRuntimeMetrics {
 				// from tm2/pkg/sdk/vm/keeper.go
 				// XXX: make maxAllocTx configurable.
@@ -324,7 +323,7 @@ func gnoTestPkg(
 				closer = testutils.CaptureStdoutAndStderr()
 			}
 
-			testFilePath := filepath.Join(pkgPath, testFileName)
+			testFilePath := filepath.Join(pkgDir, testFileName)
 			err := tests.RunFileTest(rootDir, testFilePath, tests.WithSyncWanted(cfg.updateGoldenTests))
 			duration := time.Since(startedAt)
 			dstr := fmtDuration(duration)

diff --git a/gnovm/cmd/gno/util.go b/gnovm/cmd/gno/util.go
@@ -55,7 +55,7 @@ func gnoFilesFromArgs(args []string) ([]string, error) {
 	return paths, nil
 }
 
-func gnoPackagePathsFromArgs(args []string) ([]string, error) {
+func gnoPackagesFromArgs(args []string) ([]string, error) {
 	paths := []string{}
 	for _, arg := range args {
 		info, err := os.Stat(arg)