fix e2e

ava-labs · Dec 5, 2024 · 8abf976 · 8abf976
1 parent bb4606a
commit 8abf976
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/cmd/nodecmd/local.go b/cmd/nodecmd/local.go
@@ -162,21 +162,17 @@ func localStartNode(_ *cobra.Command, args []string) error {
 		UseLatestAvalanchegoPreReleaseVersion: useLatestAvalanchegoPreReleaseVersion,
 		UseLatestAvalanchegoReleaseVersion:    useLatestAvalanchegoReleaseVersion,
 	}
-	var (
-		err        error
-		nodeConfig map[string]interface{}
-	)
+	nodeConfig := make(map[string]interface{})
 	if nodeConfigPath != "" {
+		var err error
 		nodeConfig, err = utils.ReadJSON(nodeConfigPath)
 		if err != nil {
 			return err
 		}
 	}
-
 	if partialSync {
 		nodeConfig[config.PartialSyncPrimaryNetworkKey] = true
 	}
-
 	return node.StartLocalNode(
 		app,
 		clusterName,

diff --git a/tests/e2e/commands/etna.go b/tests/e2e/commands/etna.go
@@ -239,8 +239,6 @@ func AddEtnaSubnetValidatorToCluster(
 		"blockchain",
 		"addValidator",
 		subnetName,
-		"--cluster",
-		clusterName,
 		"--ewoq",
 		"--balance",
 		strconv.Itoa(balance),
@@ -256,6 +254,9 @@ func AddEtnaSubnetValidatorToCluster(
 		"100s",
 		"--"+constants.SkipUpdateFlag,
 	)
+	if clusterName != "" {
+		cmd.Args = append(cmd.Args, "--cluster", clusterName)
+	}
 	if nodeEndpoint != "" {
 		cmd.Args = append(cmd.Args, "--node-endpoint", nodeEndpoint)
 	}

diff --git a/tests/e2e/testcases/subnet/sov/addValidatorLocal/suite.go b/tests/e2e/testcases/subnet/sov/addValidatorLocal/suite.go
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("[Etna Add Validator SOV Local]", func() {
 		fmt.Println(output)
 
 		output, err := commands.AddEtnaSubnetValidatorToCluster(
-			testLocalNodeName,
+			"",
 			subnetName,
 			"",
 			ewoqPChainAddress,