cli: provide separate function for opening wallet

nspcc-dev · Feb 21, 2020 · 5c837e7 · 5c837e7
1 parent a7995bf
commit 5c837e7
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/cli/wallet/wallet.go b/cli/wallet/wallet.go
@@ -114,12 +114,7 @@ func NewCommands() []cli.Command {
 }
 
 func addAccount(ctx *cli.Context) error {
-	path := ctx.String("path")
-	if len(path) == 0 {
-		return cli.NewExitError(errNoPath, 1)
-	}
-
-	wall, err := wallet.NewWalletFromFile(path)
+	wall, err := openWallet(ctx.String("path"))
 	if err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -134,12 +129,7 @@ func addAccount(ctx *cli.Context) error {
 }
 
 func exportKeys(ctx *cli.Context) error {
-	path := ctx.String("path")
-	if len(path) == 0 {
-		return cli.NewExitError(errNoPath, 1)
-	}
-
-	wall, err := wallet.NewWalletFromFile(path)
+	wall, err := openWallet(ctx.String("path"))
 	if err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -197,12 +187,7 @@ loop:
 }
 
 func importMultisig(ctx *cli.Context) error {
-	path := ctx.String("path")
-	if len(path) == 0 {
-		return cli.NewExitError(errNoPath, 1)
-	}
-
-	wall, err := wallet.NewWalletFromFile(path)
+	wall, err := openWallet(ctx.String("path"))
 	if err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -241,12 +226,7 @@ func importMultisig(ctx *cli.Context) error {
 }
 
 func importWallet(ctx *cli.Context) error {
-	path := ctx.String("path")
-	if len(path) == 0 {
-		return cli.NewExitError(errNoPath, 1)
-	}
-
-	wall, err := wallet.NewWalletFromFile(path)
+	wall, err := openWallet(ctx.String("path"))
 	if err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -267,11 +247,7 @@ func importWallet(ctx *cli.Context) error {
 }
 
 func dumpWallet(ctx *cli.Context) error {
-	path := ctx.String("path")
-	if len(path) == 0 {
-		return cli.NewExitError(errNoPath, 1)
-	}
-	wall, err := wallet.NewWalletFromFile(path)
+	wall, err := openWallet(ctx.String("path"))
 	if err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -345,6 +321,13 @@ func createAccount(ctx *cli.Context, wall *wallet.Wallet) error {
 	return wall.CreateAccount(name, phrase)
 }
 
+func openWallet(path string) (*wallet.Wallet, error) {
+	if len(path) == 0 {
+		return nil, errNoPath
+	}
+	return wallet.NewWalletFromFile(path)
+}
+
 func newAccountFromWIF(wif string) (*wallet.Account, error) {
 	// note: NEP2 strings always have length of 58 even though
 	// base58 strings can have different lengths even if slice lengths are equal