adding network hardclean e2e test

Tony Zhang · Tony Zhang · commit 9f8b08e47f4b · 2025-06-11T14:39:26.000-07:00
diff --git a/tests/e2e/commands/network.go b/tests/e2e/commands/network.go
@@ -6,7 +6,6 @@ package commands
 import (
 	"fmt"
 	"os"
-	"strconv"
 
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/tests/e2e/utils"
@@ -16,7 +15,7 @@ import (
 /* #nosec G204 */
 func CleanNetwork() (string, error) {
 	output, err := utils.TestCommand(
-		utils.NetworkCmd,
+		NetworkCmd,
 		"clean",
 		[]string{
 			"--" + constants.SkipUpdateFlag,
@@ -31,44 +30,14 @@ func CleanNetwork() (string, error) {
 	return output, err
 }
 
-/* #nosec G204 */
-func CleanNetworkHard() {
-	output, err := utils.TestCommand(
-		utils.NetworkCmd,
-		"clean",
-		[]string{
-			"--hard",
-			"--" + constants.SkipUpdateFlag,
-		},
-		utils.GlobalFlags{},
-		utils.TestFlags{},
-	)
-	if err != nil {
-		fmt.Println(output)
-		utils.PrintStdErr(err)
-	}
-	gomega.Expect(err).Should(gomega.BeNil())
-}
-
 /* #nosec G204 */
 func StartNetwork() string {
-	return StartNetworkWithVersion("")
-}
-
-func StartNetworkWithNodeNumber(numOfNodes uint) string {
-	return startNetworkWithParams(map[string]string{
-		"number-of-nodes": strconv.FormatUint(uint64(numOfNodes), 10),
-	})
-}
-
-/* #nosec G204 */
-func StartNetworkWithVersion(version string) string {
-	return startNetworkWithParams(map[string]string{
-		"version": version,
+	return StartNetworkWithParams(map[string]string{
+		"version": "",
 	})
 }
 
-func startNetworkWithParams(paramMap map[string]string) string {
+func StartNetworkWithParams(paramMap map[string]string) string {
 	cmdArgs := utils.GlobalFlags{}
 
 	for k, v := range paramMap {
@@ -88,7 +57,7 @@ func startNetworkWithParams(paramMap map[string]string) string {
 		cmdArgs["avalanchego-path"] = debugAvalanchegoPath
 	}
 	output, err := utils.TestCommand(
-		utils.NetworkCmd,
+		NetworkCmd,
 		"start",
 		[]string{
 			"--" + constants.SkipUpdateFlag,
@@ -107,7 +76,7 @@ func startNetworkWithParams(paramMap map[string]string) string {
 /* #nosec G204 */
 func StopNetwork(stopCmdFlags ...string) error {
 	output, err := utils.TestCommand(
-		utils.NetworkCmd,
+		NetworkCmd,
 		"stop",
 		append([]string{
 			"--" + constants.SkipUpdateFlag,
@@ -124,7 +93,7 @@ func StopNetwork(stopCmdFlags ...string) error {
 
 func GetNetworkStatus() (string, error) {
 	output, err := utils.TestCommand(
-		utils.NetworkCmd,
+		NetworkCmd,
 		"status",
 		[]string{
 			"--" + constants.SkipUpdateFlag,
diff --git a/tests/e2e/commandse2e/blockchain/deploy/suite.go b/tests/e2e/commandse2e/blockchain/deploy/suite.go
@@ -4,6 +4,7 @@
 package deploy
 
 import (
+	"github.com/ava-labs/avalanche-cli/cmd"
 	"github.com/ava-labs/avalanche-cli/tests/e2e/utils"
 
 	"github.com/ava-labs/avalanche-cli/tests/e2e/commands"
@@ -36,7 +37,7 @@ var _ = ginkgo.Describe("[Blockchain Deploy Flags]", ginkgo.Ordered, func() {
 	}
 	ginkgo.It("HAPPY PATH: local deploy default", func() {
 		testFlags := utils.TestFlags{}
-		output, err := utils.TestCommand(utils.BlockchainCmd, "deploy", blockchainCmdArgs, globalFlags, testFlags)
+		output, err := utils.TestCommand(cmd.BlockchainCmd, "deploy", blockchainCmdArgs, globalFlags, testFlags)
 		gomega.Expect(output).Should(gomega.ContainSubstring("L1 is successfully deployed on Local Network"))
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
@@ -45,7 +46,7 @@ var _ = ginkgo.Describe("[Blockchain Deploy Flags]", ginkgo.Ordered, func() {
 		testFlags := utils.TestFlags{
 			"avalanchego-version": "invalid_version",
 		}
-		output, err := utils.TestCommand(utils.BlockchainCmd, "deploy", blockchainCmdArgs, globalFlags, testFlags)
+		output, err := utils.TestCommand(cmd.BlockchainCmd, "deploy", blockchainCmdArgs, globalFlags, testFlags)
 		gomega.Expect(err).Should(gomega.HaveOccurred())
 		gomega.Expect(output).Should(gomega.ContainSubstring("invalid version string"))
 	})
diff --git a/tests/e2e/testcases/blockchain/configure/suite.go b/tests/e2e/testcases/blockchain/configure/suite.go
@@ -108,7 +108,7 @@ var _ = ginkgo.Describe("[Blockchain Configure]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		commands.DeleteSubnetConfig(utils.BlockchainName)
 	})
 
diff --git a/tests/e2e/testcases/blockchain/convert/suite.go b/tests/e2e/testcases/blockchain/convert/suite.go
@@ -57,7 +57,7 @@ var _ = ginkgo.Describe("[Blockchain Convert]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		// Cleanup test subnet config
 		commands.DeleteSubnetConfig(subnetName)
 	})
diff --git a/tests/e2e/testcases/blockchain/deploy/suite.go b/tests/e2e/testcases/blockchain/deploy/suite.go
@@ -47,7 +47,7 @@ var _ = ginkgo.Describe("[Blockchain Deploy]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		// Cleanup test subnet config
 		commands.DeleteSubnetConfig(subnetName)
 	})
diff --git a/tests/e2e/testcases/icm/deploy/suite.go b/tests/e2e/testcases/icm/deploy/suite.go
@@ -40,7 +40,7 @@ var _ = ginkgo.Describe("[ICM] deploy", func() {
 		})
 
 		ginkgo.AfterEach(func() {
-			commands.CleanNetwork()
+			_, _ = commands.CleanNetwork()
 			err := utils.DeleteConfigs(subnetName)
 			gomega.Expect(err).Should(gomega.BeNil())
 		})
@@ -358,7 +358,7 @@ var _ = ginkgo.Describe("[ICM] deploy", func() {
 		})
 
 		ginkgo.AfterEach(func() {
-			commands.CleanNetwork()
+			_, _ = commands.CleanNetwork()
 		})
 		ginkgo.It("should fail with invalid mutually exclusive fields (network flags)", func() {
 			testFlags := utils.TestFlags{
diff --git a/tests/e2e/testcases/icm/sendMsg/suite.go b/tests/e2e/testcases/icm/sendMsg/suite.go
@@ -29,7 +29,7 @@ var _ = ginkgo.Describe("[ICM] sendMsg", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 
diff --git a/tests/e2e/testcases/network/clean/suite.go b/tests/e2e/testcases/network/clean/suite.go
@@ -4,7 +4,11 @@
 package network
 
 import (
+	"path"
+
+	"github.com/ava-labs/avalanche-cli/sdk/utils"
 	"github.com/ava-labs/avalanche-cli/tests/e2e/commands"
+	testUtils "github.com/ava-labs/avalanche-cli/tests/e2e/utils"
 	ginkgo "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )
@@ -24,4 +28,16 @@ var _ = ginkgo.Describe("[Local Network] Clean", ginkgo.Ordered, func() {
 		gomega.Expect(err).Should(gomega.BeNil())
 		gomega.Expect(out).Should(gomega.ContainSubstring("No network is running"))
 	})
+
+	ginkgo.It("hard clean should remove downloaded avalanchego and plugins", func() {
+		out := commands.StartNetwork()
+		gomega.Expect(out).Should(gomega.ContainSubstring("Network ready to use"))
+
+		out, err := commands.CleanNetwork()
+		gomega.Expect(err).Should(gomega.BeNil())
+
+		// check if binaries are removed
+		binDirExists := utils.DirExists(path.Join(testUtils.GetBaseDir(), "bin"))
+		gomega.Expect(binDirExists).Should(gomega.BeFalse())
+	})
 })
diff --git a/tests/e2e/testcases/network/start/suite.go b/tests/e2e/testcases/network/start/suite.go
@@ -5,6 +5,7 @@ package network
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/ava-labs/avalanche-cli/tests/e2e/commands"
 	ginkgo "github.com/onsi/ginkgo/v2"
@@ -34,7 +35,9 @@ var _ = ginkgo.Describe("[Local Network] Start", ginkgo.Ordered, func() {
 
 	ginkgo.It("can start network with given number of nodes", func() {
 		numOfNodes := uint(3)
-		out := commands.StartNetworkWithNodeNumber(numOfNodes)
+		out := commands.StartNetworkWithParams(map[string]string{
+			"number-of-nodes": strconv.FormatUint(uint64(numOfNodes), 10),
+		})
 		gomega.Expect(out).Should(gomega.ContainSubstring("Network ready to use"))
 
 		// check network status
diff --git a/tests/e2e/testcases/packageman/suite.go b/tests/e2e/testcases/packageman/suite.go
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
 	ginkgo.BeforeEach(func() {
-		commands.CleanNetworkHard()
+		_, _ = commands.CleanNetwork()
 	})
 
 	ginkgo.AfterEach(func() {
diff --git a/tests/e2e/testcases/relayer/deploy/suite.go b/tests/e2e/testcases/relayer/deploy/suite.go
@@ -31,7 +31,7 @@ var _ = ginkgo.Describe("[Relayer] deploy", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		_, err := commands.DeleteKey(keyName)
 		gomega.Expect(err).Should(gomega.BeNil())
 		_, err = commands.DeleteKey(key2Name)
@@ -388,7 +388,7 @@ var _ = ginkgo.Describe("[Relayer] deploy", func() {
 			})
 
 			ginkgo.AfterEach(func() {
-				commands.CleanNetwork()
+				_, _ = commands.CleanNetwork()
 				err := utils.DeleteConfigs(subnetName)
 				gomega.Expect(err).Should(gomega.BeNil())
 				utils.DeleteCustomBinary(subnetName)
diff --git a/tests/e2e/testcases/relayer/logs_cmd/suite.go b/tests/e2e/testcases/relayer/logs_cmd/suite.go
@@ -25,7 +25,7 @@ var _ = ginkgo.Describe("[Relayer] stop", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		_, err := commands.DeleteKey(keyName)
 		gomega.Expect(err).Should(gomega.BeNil())
 		err = utils.DeleteConfigs(subnetName)
diff --git a/tests/e2e/testcases/relayer/start/suite.go b/tests/e2e/testcases/relayer/start/suite.go
@@ -25,7 +25,7 @@ var _ = ginkgo.Describe("[Relayer] start", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		_, err := commands.DeleteKey(keyName)
 		gomega.Expect(err).Should(gomega.BeNil())
 		err = utils.DeleteConfigs(subnetName)
diff --git a/tests/e2e/testcases/relayer/stop/suite.go b/tests/e2e/testcases/relayer/stop/suite.go
@@ -27,7 +27,7 @@ var _ = ginkgo.Describe("[Relayer] stop", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetwork()
+		_, _ = commands.CleanNetwork()
 		_, err := commands.DeleteKey(keyName)
 		gomega.Expect(err).Should(gomega.BeNil())
 		err = utils.DeleteConfigs(subnetName)
diff --git a/tests/e2e/testcases/subnet/non-sov/public/suite.go b/tests/e2e/testcases/subnet/non-sov/public/suite.go
@@ -96,7 +96,9 @@ var _ = ginkgo.Describe("[Public Subnet non SOV]", func() {
 		_, avagoVersion := commands.CreateSubnetEvmConfigNonSOV(subnetName, utils.SubnetEvmGenesisPath, false)
 
 		// local network
-		commands.StartNetworkWithVersion(avagoVersion)
+		commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 	})
 
 	ginkgo.AfterEach(func() {
diff --git a/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoA/suite.go b/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoA/suite.go
@@ -36,7 +36,9 @@ var _ = ginkgo.Describe("[Etna AddRemove Validator SOV PoA]", func() {
 	})
 
 	ginkgo.It("Can create an Etna Local Network", func() {
-		output := commands.StartNetworkWithVersion(avagoVersion)
+		output := commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 		fmt.Println(output)
 	})
 
diff --git a/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoS/suite.go b/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoS/suite.go
@@ -38,7 +38,9 @@ var _ = ginkgo.Describe("[Etna AddRemove Validator SOV PoS]", func() {
 	})
 
 	ginkgo.It("Can create an Etna Local Network", func() {
-		output := commands.StartNetworkWithVersion(avagoVersion)
+		output := commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 		fmt.Println(output)
 	})
 
diff --git a/tests/e2e/testcases/subnet/sov/addValidatorLocal/suite.go b/tests/e2e/testcases/subnet/sov/addValidatorLocal/suite.go
@@ -30,7 +30,9 @@ var _ = ginkgo.Describe("[Etna Add Validator SOV Local]", func() {
 		)
 	})
 	ginkgo.It("Can deploy blockchain to localhost and upsize it", func() {
-		output := commands.StartNetworkWithVersion(avagoVersion)
+		output := commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 		fmt.Println(output)
 		output, err := commands.DeployEtnaBlockchain(
 			utils.BlockchainName,
diff --git a/tests/e2e/testcases/subnet/sov/etna/suite.go b/tests/e2e/testcases/subnet/sov/etna/suite.go
@@ -386,7 +386,9 @@ var _ = ginkgo.Describe("[Etna Subnet SOV]", func() {
 
 	ginkgo.It("Start Local Node on Etna & Deploy the Subnet To Etna Local Network using cluster flag", func() {
 		avagoVersion = createEtnaSubnetEvmConfig(true, false)
-		_ = commands.StartNetworkWithVersion(avagoVersion)
+		_ = commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 		_, err := commands.CreateLocalEtnaNode(avagoVersion, utils.TestLocalNodeName, 1)
 		gomega.Expect(err).Should(gomega.BeNil())
 		deployEtnaSubnetClusterFlagConvertOnly(utils.TestLocalNodeName)
@@ -398,7 +400,9 @@ var _ = ginkgo.Describe("[Etna Subnet SOV]", func() {
 
 	ginkgo.It("Mix and match network and cluster flags test 1", func() {
 		avagoVersion = createEtnaSubnetEvmConfig(true, false)
-		_ = commands.StartNetworkWithVersion(avagoVersion)
+		_ = commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 		_, err := commands.CreateLocalEtnaNode(avagoVersion, utils.TestLocalNodeName, 1)
 		gomega.Expect(err).Should(gomega.BeNil())
 		deployEtnaSubnetClusterFlagConvertOnly(utils.TestLocalNodeName)
diff --git a/tests/e2e/testcases/subnet/sov/public/suite.go b/tests/e2e/testcases/subnet/sov/public/suite.go
@@ -79,7 +79,9 @@ var _ = ginkgo.Describe("[Public Subnet SOV]", func() {
 		_, avagoVersion := commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
 
 		// local network
-		commands.StartNetworkWithVersion(avagoVersion)
+		commands.StartNetworkWithParams(map[string]string{
+			"version": avagoVersion,
+		})
 	})
 
 	ginkgo.AfterEach(func() {
diff --git a/tests/e2e/testcases/upgrade/non-sov/suite.go b/tests/e2e/testcases/upgrade/non-sov/suite.go
diff --git a/tests/e2e/testcases/upgrade/sov/suite.go b/tests/e2e/testcases/upgrade/sov/suite.go
