From b8cf0a6b88faff7dc36368a5edbed638f54c09ec Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Fri, 2 Feb 2024 09:54:47 +0300 Subject: [PATCH] [#932] adm: Move `deploy` to package `contract` Signed-off-by: Anton Nikiforov --- .../internal/modules/morph/{ => contract}/deploy.go | 10 +++++----- cmd/frostfs-adm/internal/modules/morph/root.go | 6 +----- 2 files changed, 6 insertions(+), 10 deletions(-) rename cmd/frostfs-adm/internal/modules/morph/{ => contract}/deploy.go (97%) diff --git a/cmd/frostfs-adm/internal/modules/morph/deploy.go b/cmd/frostfs-adm/internal/modules/morph/contract/deploy.go similarity index 97% rename from cmd/frostfs-adm/internal/modules/morph/deploy.go rename to cmd/frostfs-adm/internal/modules/morph/contract/deploy.go index b5b2794c..35007a27 100644 --- a/cmd/frostfs-adm/internal/modules/morph/deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/contract/deploy.go @@ -1,4 +1,4 @@ -package morph +package contract import ( "encoding/json" @@ -26,7 +26,7 @@ const ( updateFlag = "update" ) -var deployCmd = &cobra.Command{ +var DeployCmd = &cobra.Command{ Use: "deploy", Short: "Deploy additional smart-contracts", Long: `Deploy additional smart-contract which are not related to core. @@ -44,14 +44,14 @@ NNS name is taken by stripping '_contract.nef' from the NEF file (similar to fro } func init() { - ff := deployCmd.Flags() + ff := DeployCmd.Flags() ff.String(util.AlphabetWalletsFlag, "", util.AlphabetWalletsFlagDesc) - _ = deployCmd.MarkFlagFilename(util.AlphabetWalletsFlag) + _ = DeployCmd.MarkFlagFilename(util.AlphabetWalletsFlag) ff.StringP(util.EndpointFlag, "r", "", util.EndpointFlagDesc) ff.String(contractPathFlag, "", "Path to the contract directory") - _ = deployCmd.MarkFlagFilename(contractPathFlag) + _ = DeployCmd.MarkFlagFilename(contractPathFlag) ff.Bool(updateFlag, false, "Update an existing contract") ff.String(util.CustomZoneFlag, "frostfs", "Custom zone for NNS") diff --git a/cmd/frostfs-adm/internal/modules/morph/root.go b/cmd/frostfs-adm/internal/modules/morph/root.go index 3af6f78a..44ff543d 100644 --- a/cmd/frostfs-adm/internal/modules/morph/root.go +++ b/cmd/frostfs-adm/internal/modules/morph/root.go @@ -103,7 +103,7 @@ var ( func init() { initGenerateAlphabetCmd() initInitCmd() - initDeployCmd() + RootCmd.AddCommand(contract.DeployCmd) initGenerateStorageCmd() RootCmd.AddCommand(netmap.ForceNewEpoch) RootCmd.AddCommand(node.RemoveCmd) @@ -169,7 +169,3 @@ func initGenerateAlphabetCmd() { generateAlphabetCmd.Flags().String(util.AlphabetWalletsFlag, "", util.AlphabetWalletsFlagDesc) generateAlphabetCmd.Flags().Uint(alphabetSizeFlag, 7, "Amount of alphabet wallets to generate") } - -func initDeployCmd() { - RootCmd.AddCommand(deployCmd) -}