removing --hard option from clean cmd

Author: Tonix517

cmd/commands.md

@@ -2067,7 +2067,6 @@ avalanche network clean [subcommand] [flags]
 **Flags:**
 
 ```bash
---hard                 Also clean downloaded avalanchego and plugin binaries
 -h, --help             help for clean
 --config string        config file (default is $HOME/.avalanche-cli/config.json)
 --log-level string     log level for the application (default "ERROR")

cmd/networkcmd/clean.go

@@ -5,7 +5,6 @@ package networkcmd
 import (
 	"errors"
 	"os"
-	"path/filepath"
 
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
@@ -19,8 +18,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var hard bool
-
 func newCleanCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "clean",
@@ -32,13 +29,6 @@ configuration.`,
 		Args: cobrautils.ExactArgs(0),
 	}
 
-	cmd.Flags().BoolVar(
-		&hard,
-		"hard",
-		false,
-		"Also clean downloaded avalanchego and plugin binaries",
-	)
-
 	return cmd
 }
 
@@ -59,12 +49,6 @@ func clean(*cobra.Command, []string) error {
 		return err
 	}
 
-	if hard {
-		ux.Logger.PrintToUser("hard clean requested via flag, removing all downloaded avalanchego and plugin binaries")
-		binDir := filepath.Join(app.GetBaseDir(), constants.AvalancheCliBinDir)
-		cleanBins(binDir)
-	}
-
 	if err := app.ResetPluginsDir(); err != nil {
 		return err
 	}

tests/e2e/commands/network.go

@@ -30,24 +30,6 @@ func CleanNetwork() {
 	gomega.Expect(err).Should(gomega.BeNil())
 }
 
-/* #nosec G204 */
-func CleanNetworkHard() {
-	cmd := exec.Command(
-		CLIBinary,
-		NetworkCmd,
-		"clean",
-		"--hard",
-		"--"+constants.SkipUpdateFlag,
-	)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		fmt.Println(cmd.String())
-		fmt.Println(string(output))
-		utils.PrintStdErr(err)
-	}
-	gomega.Expect(err).Should(gomega.BeNil())
-}
-
 /* #nosec G204 */
 func StartNetwork() string {
 	return StartNetworkWithVersion("")

tests/e2e/testcases/network/suite.go

@@ -116,31 +116,4 @@ var _ = ginkgo.Describe("[Network]", ginkgo.Ordered, func() {
 
 		commands.DeleteSubnetConfig(subnetName)
 	})
-
-	ginkgo.It("clean hard deletes plugin binaries non SOV", func() {
-		commands.CreateSubnetEvmConfigNonSOV(subnetName, utils.SubnetEvmGenesisPath, false)
-		deployOutput := commands.DeploySubnetLocallyNonSOV(subnetName)
-		rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
-		if err != nil {
-			fmt.Println(deployOutput)
-		}
-		gomega.Expect(err).Should(gomega.BeNil())
-		gomega.Expect(rpcs).Should(gomega.HaveLen(1))
-
-		// check that plugin binaries exist
-		plugins, err := utils.GetPluginBinaries()
-		// should have only subnet-evm binary
-		gomega.Expect(len(plugins)).Should(gomega.Equal(1))
-		gomega.Expect(err).Should(gomega.BeNil())
-
-		commands.CleanNetwork()
-
-		// check that plugin binaries exist
-		plugins, err = utils.GetPluginBinaries()
-		// should be empty
-		gomega.Expect(len(plugins)).Should(gomega.Equal(0))
-		gomega.Expect(err).Should(gomega.BeNil())
-
-		commands.DeleteSubnetConfig(subnetName)
-	})
 })

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() {
@@ -42,9 +42,11 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.It("can deploy a subnet with subnet-evm version non SOV", func() {
-		// check subnet-evm install precondition
-		gomega.Expect(utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey1])).Should(gomega.BeFalse())
-		gomega.Expect(utils.CheckAvalancheGoExists(binaryToVersion[utils.SoloAvagoKey])).Should(gomega.BeFalse())
+		// remove installed subnet-evm if detected
+		if utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey1]) ||
+			utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloAvagoKey]) {
+			_ = utils.DeleteBins()
+		}
 
 		commands.CreateSubnetEvmConfigWithVersionNonSOV(subnetName, utils.SubnetEvmGenesisPath, binaryToVersion[utils.SoloSubnetEVMKey1], false)
 		deployOutput := commands.DeploySubnetLocallyWithVersionNonSOV(subnetName, binaryToVersion[utils.SoloAvagoKey])
@@ -73,9 +75,10 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
 		evmVersion := binaryToVersion[utils.SoloSubnetEVMKey1]
 		avagoVersion := binaryToVersion[utils.SoloAvagoKey]
 
-		// check subnet-evm install precondition
-		gomega.Expect(utils.CheckSubnetEVMExists(evmVersion)).Should(gomega.BeFalse())
-		gomega.Expect(utils.CheckAvalancheGoExists(avagoVersion)).Should(gomega.BeFalse())
+		// remove subnet-evm if installed version detected
+		if utils.CheckSubnetEVMExists(evmVersion) || utils.CheckAvalancheGoExists(avagoVersion) {
+			_ = utils.DeleteBins()
+		}
 
 		commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, evmVersion)
 		deployOutput := commands.DeploySubnetLocallyWithVersionSOV(subnetName, avagoVersion)
@@ -101,9 +104,11 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.It("can deploy multiple subnet-evm versions non SOV", func() {
-		// check subnet-evm install precondition
-		gomega.Expect(utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey1])).Should(gomega.BeFalse())
-		gomega.Expect(utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey2])).Should(gomega.BeFalse())
+		// remove installed subnet-evm if detected
+		if utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey1]) ||
+			utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey2]) {
+			_ = utils.DeleteBins()
+		}
 
 		commands.CreateSubnetEvmConfigWithVersionNonSOV(subnetName, utils.SubnetEvmGenesisPath, binaryToVersion[utils.SoloSubnetEVMKey1], false)
 		commands.CreateSubnetEvmConfigWithVersionNonSOV(secondSubnetName, utils.SubnetEvmGenesis2Path, binaryToVersion[utils.SoloSubnetEVMKey2], false)
@@ -145,9 +150,10 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.It("can deploy multiple subnet-evm versions SOV", func() {
-		// check subnet-evm install precondition
-		gomega.Expect(utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey1])).Should(gomega.BeFalse())
-		gomega.Expect(utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey2])).Should(gomega.BeFalse())
+		if utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey1]) ||
+			utils.CheckSubnetEVMExists(binaryToVersion[utils.SoloSubnetEVMKey2]) {
+			_ = utils.DeleteBins()
+		}
 
 		commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, binaryToVersion[utils.SoloSubnetEVMKey1])
 		commands.CreateSubnetEvmConfigWithVersionSOV(secondSubnetName, utils.SubnetEvmGenesisPoaPath, binaryToVersion[utils.SoloSubnetEVMKey2])

tests/e2e/testcases/upgrade/non-sov/suite.go

@@ -51,7 +51,7 @@ var (
 // need to have this outside the normal suite because of the BeforeEach
 var _ = ginkgo.Describe("[Upgrade expect network failure non SOV]", ginkgo.Ordered, func() {
 	ginkgo.AfterEach(func() {
-		commands.CleanNetworkHard()
+		commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
@@ -91,7 +91,7 @@ var _ = ginkgo.Describe("[Upgrade expect network failure non SOV]", ginkgo.Order
 // and then check the file is there and has the correct content.
 var _ = ginkgo.Describe("[Upgrade public network non SOV]", ginkgo.Ordered, func() {
 	ginkgo.AfterEach(func() {
-		commands.CleanNetworkHard()
+		commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
@@ -158,7 +158,7 @@ var _ = ginkgo.Describe("[Upgrade local network non SOV]", ginkgo.Ordered, func(
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetworkHard()
+		commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 		err = utils.DeleteConfigs(secondSubnetName)

tests/e2e/testcases/upgrade/sov/suite.go

@@ -51,7 +51,7 @@ var (
 // need to have this outside the normal suite because of the BeforeEach
 var _ = ginkgo.Describe("[Upgrade expect network failure SOV]", ginkgo.Ordered, func() {
 	ginkgo.AfterEach(func() {
-		commands.CleanNetworkHard()
+		commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
@@ -91,7 +91,7 @@ var _ = ginkgo.Describe("[Upgrade expect network failure SOV]", ginkgo.Ordered,
 // and then check the file is there and has the correct content.
 var _ = ginkgo.Describe("[Upgrade public network SOV]", ginkgo.Ordered, func() {
 	ginkgo.AfterEach(func() {
-		commands.CleanNetworkHard()
+		commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
@@ -158,7 +158,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		commands.CleanNetworkHard()
+		commands.CleanNetwork()
 		err := utils.DeleteConfigs(subnetName)
 		gomega.Expect(err).Should(gomega.BeNil())
 		err = utils.DeleteConfigs(secondSubnetName)