From 875f0e79a25db6ba8c77ef3292e06481f3456583 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 4 May 2022 10:45:08 +0300 Subject: [PATCH] [#1346] neofs-adm: do not ask password twice When a contract wallet is created, there is no need to decrypt newly-created accounts. Signed-off-by: Evgenii Stratonikov --- CHANGELOG.md | 3 +++ cmd/neofs-adm/internal/modules/morph/group.go | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a28c62aa6..3286b4794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ Changelog for NeoFS Node ### Added - Config examples for Inner ring application (#1358) +### Fixed +- Do not ask for contract wallet password twice (#1346) + ## [0.28.1] - 2022-05-05 ### Fixed diff --git a/cmd/neofs-adm/internal/modules/morph/group.go b/cmd/neofs-adm/internal/modules/morph/group.go index 59c6f6c56..d3ae5c966 100644 --- a/cmd/neofs-adm/internal/modules/morph/group.go +++ b/cmd/neofs-adm/internal/modules/morph/group.go @@ -60,10 +60,7 @@ func openContractWallet(cmd *cobra.Command, walletDir string) (*wallet.Wallet, e cmd.Printf("Contract group wallet is missing, initialize at %s\n", filepath.Join(walletDir, contractWalletFilename)) - w, err = initializeContractWallet(walletDir) - if err != nil { - return nil, err - } + return initializeContractWallet(walletDir) } password, err := getPassword(contractWalletPasswordKey, "Password for contract wallet > ")