From b685af487f8c8185bded592b048d39b7482cee08 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 8 Apr 2022 17:40:51 +0300 Subject: [PATCH] [#722] neofs-adm: Replace `path` with `filepath` package Signed-off-by: Evgenii Stratonikov --- cmd/neofs-adm/internal/modules/morph/group.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/neofs-adm/internal/modules/morph/group.go b/cmd/neofs-adm/internal/modules/morph/group.go index d3ae5c96..3f48eb3d 100644 --- a/cmd/neofs-adm/internal/modules/morph/group.go +++ b/cmd/neofs-adm/internal/modules/morph/group.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" "os" - "path" "path/filepath" "github.com/nspcc-dev/neo-go/cli/input" @@ -27,7 +26,7 @@ func initializeContractWallet(walletDir string) (*wallet.Wallet, error) { return nil, err } - w, err := wallet.NewWallet(path.Join(walletDir, contractWalletFilename)) + w, err := wallet.NewWallet(filepath.Join(walletDir, contractWalletFilename)) if err != nil { return nil, err } @@ -51,15 +50,14 @@ func initializeContractWallet(walletDir string) (*wallet.Wallet, error) { } func openContractWallet(cmd *cobra.Command, walletDir string) (*wallet.Wallet, error) { - p := path.Join(walletDir, contractWalletFilename) + p := filepath.Join(walletDir, contractWalletFilename) w, err := wallet.NewWalletFromFile(p) if err != nil { if !os.IsNotExist(err) { return nil, fmt.Errorf("can't open wallet: %w", err) } - cmd.Printf("Contract group wallet is missing, initialize at %s\n", - filepath.Join(walletDir, contractWalletFilename)) + cmd.Printf("Contract group wallet is missing, initialize at %s\n", p) return initializeContractWallet(walletDir) }