aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-04-02 04:41:47 +0800
committerFelix Lange <fjl@twurst.com>2016-04-12 21:58:07 +0800
commit6f1ca0bc910b65b517277f72ca52dadcdc713570 (patch)
tree11cd425e341f6952a0142fa0abbb9445ea917b7d /cmd
parenta9f26dcd0d14c0cb9f309ebccf81e8f741fc4636 (diff)
downloadgo-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.tar
go-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.tar.gz
go-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.tar.bz2
go-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.tar.lz
go-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.tar.xz
go-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.tar.zst
go-tangerine-6f1ca0bc910b65b517277f72ca52dadcdc713570.zip
accounts: add ErrDecrypt
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/accountcmd.go2
-rw-r--r--cmd/geth/accountcmd_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
index 35b6b2dd8..6e8d2b7eb 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/geth/accountcmd.go
@@ -263,7 +263,7 @@ func importWallet(ctx *cli.Context) {
acct, err := accman.ImportPreSaleKey(keyJson, passphrase)
if err != nil {
- utils.Fatalf("Could not create the account: %v", err)
+ utils.Fatalf("%v", err)
}
fmt.Printf("Address: {%x}\n", acct.Address)
}
diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go
index 7a1bf4ea1..fa3f73843 100644
--- a/cmd/geth/accountcmd_test.go
+++ b/cmd/geth/accountcmd_test.go
@@ -127,7 +127,7 @@ func TestWalletImportBadPassword(t *testing.T) {
geth.expect(`
!! Unsupported terminal, password will be echoed.
Passphrase: {{.InputLine "wrong"}}
-Fatal: Could not create the account: Decryption failed: PKCS7Unpad failed after AES decryption
+Fatal: could not decrypt key with given passphrase
`)
}