From 45c9b7eb641beb3cb455262a421173985cd72354 Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Mon, 2 Dec 2024 18:14:42 -0500 Subject: [PATCH 1/3] change deploy flags --- cmd/blockchaincmd/deploy.go | 10 +++++++++- tests/e2e/testcases/subnet/sov/etna/suite.go | 2 -- tests/e2e/testcases/validatormanager/suite.go | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/blockchaincmd/deploy.go b/cmd/blockchaincmd/deploy.go index a5db0b932..a18784157 100644 --- a/cmd/blockchaincmd/deploy.go +++ b/cmd/blockchaincmd/deploy.go @@ -181,7 +181,7 @@ so you can take your locally tested Subnet and deploy it on Fuji or Mainnet.`, cmd.Flags().StringSliceVar(&aggregatorExtraEndpoints, "aggregator-extra-endpoints", nil, "endpoints for extra nodes that are needed in signature aggregation") cmd.Flags().BoolVar(&useLocalMachine, "use-local-machine", false, "use local machine as a blockchain validator") cmd.Flags().IntVar(&numBootstrapValidators, "num-bootstrap-validators", 0, "(only if --generate-node-id is true) number of bootstrap validators to set up in sovereign L1 validator)") - cmd.Flags().IntVar(&numLocalNodes, "num-local-nodes", 1, "number of nodes to be created on local machine") + cmd.Flags().IntVar(&numLocalNodes, "num-local-nodes", 0, "number of nodes to be created on local machine") cmd.Flags().StringVar(&changeOwnerAddress, "change-owner-address", "", "address that will receive change if node is no longer L1 validator") cmd.Flags().Uint64Var(&poSMinimumStakeAmount, "pos-minimum-stake-amount", 1, "minimum stake amount") @@ -615,6 +615,9 @@ func deployBlockchain(cmd *cobra.Command, args []string) error { network = models.ConvertClusterToNetwork(network) } } + if numLocalNodes > 0 { + useLocalMachine = true + } // ask user if we want to use local machine if cluster is not provided if network.Kind != models.Local && !useLocalMachine && clusterNameFlagValue == "" { ux.Logger.PrintToUser("You can use your local machine as a bootstrap validator on the blockchain") @@ -625,6 +628,11 @@ func deployBlockchain(cmd *cobra.Command, args []string) error { return err } } + // 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 = 1 + } // if no cluster provided - we create one with fmt.Sprintf("%s-local-node", blockchainName) name if useLocalMachine && clusterNameFlagValue == "" { // stop local avalanchego process so that we can generate new local cluster diff --git a/tests/e2e/testcases/subnet/sov/etna/suite.go b/tests/e2e/testcases/subnet/sov/etna/suite.go index 10e266ce4..d9f48a2df 100644 --- a/tests/e2e/testcases/subnet/sov/etna/suite.go +++ b/tests/e2e/testcases/subnet/sov/etna/suite.go @@ -102,7 +102,6 @@ func deployEtnaSubnetEtnaFlag() { "deploy", subnetName, "--etna-devnet", - "--use-local-machine", "--num-local-nodes=1", "--ewoq", "--change-owner-address", @@ -131,7 +130,6 @@ func deployEtnaSubnetEtnaFlagConvertOnly() { "deploy", subnetName, "--etna-devnet", - "--use-local-machine", "--num-local-nodes=1", "--convert-only", "--ewoq", diff --git a/tests/e2e/testcases/validatormanager/suite.go b/tests/e2e/testcases/validatormanager/suite.go index 9eaa2daf4..8555cdfba 100644 --- a/tests/e2e/testcases/validatormanager/suite.go +++ b/tests/e2e/testcases/validatormanager/suite.go @@ -83,7 +83,6 @@ func createSovereignSubnet() (string, string, error) { "deploy", subnetName, "--etna-devnet", - "--use-local-machine", "--num-local-nodes=1", "--ewoq", "--convert-only", From 1b36f4c2287954e912d4657965febb69920e896d Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Mon, 2 Dec 2024 18:19:46 -0500 Subject: [PATCH 2/3] use constants --- cmd/blockchaincmd/deploy.go | 2 +- pkg/constants/constants.go | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cmd/blockchaincmd/deploy.go b/cmd/blockchaincmd/deploy.go index a18784157..aa6a05dd4 100644 --- a/cmd/blockchaincmd/deploy.go +++ b/cmd/blockchaincmd/deploy.go @@ -631,7 +631,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error { // 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 = 1 + numLocalNodes = constants.DefaultNumberOfLocalMachineNodes } // if no cluster provided - we create one with fmt.Sprintf("%s-local-node", blockchainName) name if useLocalMachine && clusterNameFlagValue == "" { diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 2a8f10283..342e5eeda 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -334,16 +334,17 @@ const ( PluginDir = "plugins" LocalDir = "local" - MetricsNetwork = "network" - MultiSig = "multi-sig" - SkipUpdateFlag = "skip-update-check" - LastFileName = ".last_actions.json" - APIRole = "API" - ValidatorRole = "Validator" - MonitorRole = "Monitor" - AWMRelayerRole = "Relayer" - LoadTestRole = "LoadTest" - DefaultWalletCreationTimeout = 5 * time.Second + DefaultNumberOfLocalMachineNodes = 1 + MetricsNetwork = "network" + MultiSig = "multi-sig" + SkipUpdateFlag = "skip-update-check" + LastFileName = ".last_actions.json" + APIRole = "API" + ValidatorRole = "Validator" + MonitorRole = "Monitor" + AWMRelayerRole = "Relayer" + LoadTestRole = "LoadTest" + DefaultWalletCreationTimeout = 5 * time.Second DefaultConfirmTxTimeout = 20 * time.Second From b5de83d76dcd00be18c559ed2120600c7a0fccb3 Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Tue, 3 Dec 2024 11:28:04 -0500 Subject: [PATCH 3/3] fix lint --- pkg/constants/constants.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 18e1cb783..102b665ce 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -336,16 +336,16 @@ const ( LocalDir = "local" DefaultNumberOfLocalMachineNodes = 1 - MetricsNetwork = "network" - MultiSig = "multi-sig" - SkipUpdateFlag = "skip-update-check" - LastFileName = ".last_actions.json" - APIRole = "API" - ValidatorRole = "Validator" - MonitorRole = "Monitor" - ICMRelayerRole = "Relayer" - LoadTestRole = "LoadTest" - DefaultWalletCreationTimeout = 5 * time.Second + MetricsNetwork = "network" + MultiSig = "multi-sig" + SkipUpdateFlag = "skip-update-check" + LastFileName = ".last_actions.json" + APIRole = "API" + ValidatorRole = "Validator" + MonitorRole = "Monitor" + ICMRelayerRole = "Relayer" + LoadTestRole = "LoadTest" + DefaultWalletCreationTimeout = 5 * time.Second DefaultConfirmTxTimeout = 20 * time.Second