remove duplicate flags

Author: sukantoraymond

cmd/blockchaincmd/convert.go

@@ -62,7 +62,7 @@ func newConvertCmd() *cobra.Command {
 
 Sovereign L1s require bootstrap validators. avalanche blockchain convert command gives the option of: 
 - either using local machine as bootstrap validators (set the number of bootstrap validators using 
---num-local-nodes flag, default is set to 1)
+--num-bootstrap-validators flag, default is set to 1)
 - or using remote nodes (we require the node's Node-ID and BLS info)`,
 		RunE:              convertBlockchain,
 		PersistentPostRun: handlePostRun,
@@ -88,7 +88,6 @@ Sovereign L1s require bootstrap validators. avalanche blockchain convert command
 		float64(constants.BootstrapValidatorBalanceNanoAVAX)/float64(units.Avax),
 		"set the AVAX balance of each bootstrap validator that will be used for continuous fee on P-Chain",
 	)
-	cmd.Flags().IntVar(&numLocalNodes, "num-local-nodes", 0, "number of nodes to be created on local machine")
 	cmd.Flags().UintSliceVar(&httpPorts, "http-port", []uint{}, "http port for node(s)")
 	cmd.Flags().UintSliceVar(&stakingPorts, "staking-port", []uint{}, "staking port for node(s)")
 	cmd.Flags().StringVar(&changeOwnerAddress, "change-owner-address", "", "address that will receive change if node is no longer L1 validator")
@@ -120,6 +119,7 @@ func StartLocalMachine(
 	availableBalance uint64,
 	httpPorts []uint,
 	stakingPorts []uint,
+	numBootstrapValidator int,
 ) (bool, error) {
 	var err error
 	if network.Kind == models.Local {
@@ -141,9 +141,6 @@ func StartLocalMachine(
 			network = models.ConvertClusterToNetwork(network)
 		}
 	}
-	if numLocalNodes > 0 {
-		useLocalMachine = true
-	}
 	// ask user if we want to use local machine if cluster is not provided
 	if !useLocalMachine && clusterNameFlagValue == "" {
 		ux.Logger.PrintToUser("You can use your local machine as a bootstrap validator on the blockchain")
@@ -156,8 +153,8 @@ func StartLocalMachine(
 	}
 	// default number of local machine nodes to be 1
 	// we set it here instead of at flag level so that we don't prompt if user wants to use local machine when they set numLocalNodes flag value
-	if useLocalMachine && numLocalNodes == 0 {
-		numLocalNodes = constants.DefaultNumberOfLocalMachineNodes
+	if useLocalMachine && numBootstrapValidator == 0 {
+		numBootstrapValidator = constants.DefaultNumberOfLocalMachineNodes
 	}
 	// if no cluster provided - we create one with fmt.Sprintf("%s-local-node-%s", blockchainName, networkNameComponent) name
 	if useLocalMachine && clusterNameFlagValue == "" {
@@ -180,11 +177,11 @@ func StartLocalMachine(
 			_ = localnet.LocalClusterRemove(app, clusterName)
 			ux.Logger.GreenCheckmarkToUser("Local node %s cleaned up.", clusterName)
 		}
-		requiredBalance := deployBalance * uint64(numLocalNodes)
+		requiredBalance := deployBalance * uint64(numBootstrapValidator)
 		if availableBalance < requiredBalance {
 			return false, fmt.Errorf(
 				"required balance for %d validators dynamic fee on PChain is %d but the given key has %d",
-				numLocalNodes,
+				numBootstrapValidator,
 				requiredBalance,
 				availableBalance,
 			)
@@ -243,7 +240,7 @@ func StartLocalMachine(
 			app,
 			clusterName,
 			avagoBinaryPath,
-			uint32(numLocalNodes),
+			uint32(numBootstrapValidator),
 			nodeConfig,
 			localnet.ConnectionSettings{},
 			nodeSettings,
@@ -670,6 +667,7 @@ func convertBlockchain(_ *cobra.Command, args []string) error {
 				availableBalance,
 				httpPorts,
 				stakingPorts,
+				numBootstrapValidators,
 			); err != nil {
 				return err
 			} else if cancel {

cmd/blockchaincmd/deploy.go

@@ -67,7 +67,6 @@ var (
 	skipCreatePrompt                bool
 	avagoBinaryPath                 string
 	numBootstrapValidators          int
-	numLocalNodes                   int
 	httpPorts                       []uint
 	stakingPorts                    []uint
 	partialSync                     bool
@@ -168,7 +167,6 @@ so you can take your locally tested Blockchain and deploy it on Fuji or Mainnet.
 		set.BoolVar(&generateNodeID, "generate-node-id", false, "whether to create new node id for bootstrap validators (Node-ID and BLS values in bootstrap JSON file will be overridden if --bootstrap-filepath flag is used)")
 		set.StringSliceVar(&bootstrapEndpoints, "bootstrap-endpoints", nil, "take validator node info from the given endpoints")
 		set.IntVar(&numBootstrapValidators, "num-bootstrap-validators", 0, "(only if --generate-node-id is true) number of bootstrap validators to set up in sovereign L1 validator)")
-		set.IntVar(&numLocalNodes, "num-local-nodes", 0, "number of nodes to be created on local machine")
 		set.Float64Var(
 			&deployBalanceAVAX,
 			"balance",
@@ -619,6 +617,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 				availableBalance,
 				httpPorts,
 				stakingPorts,
+				numBootstrapValidators,
 			); err != nil {
 				return err
 			} else if cancel {

tests/e2e/testcases/subnet/sov/etna/suite.go

@@ -224,7 +224,7 @@ func deployEtnaSubnetEtnaFlag() {
 		"deploy",
 		utils.SubnetName,
 		"--local",
-		"--num-local-nodes=1",
+		"--num-bootstrap-validators=1",
 		"--ewoq",
 		"--change-owner-address",
 		ewoqPChainAddress,
@@ -252,7 +252,7 @@ func deployEtnaSubnetEtnaFlagConvertOnly() {
 		"deploy",
 		utils.SubnetName,
 		"--local",
-		"--num-local-nodes=1",
+		"--num-bootstrap-validators=1",
 		"--convert-only",
 		"--ewoq",
 		"--change-owner-address",

tests/e2e/testcases/validatormanager/suite.go

@@ -82,7 +82,7 @@ func createSovereignSubnet() (string, string, error) {
 		"deploy",
 		utils.SubnetName,
 		"--local",
-		"--num-local-nodes=1",
+		"--num-bootstrap-validators=1",
 		"--ewoq",
 		"--convert-only",
 		"--change-owner-address",