aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-03-31 04:58:08 +0800
committerFelix Lange <fjl@twurst.com>2016-04-12 21:59:17 +0800
commitaca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e (patch)
tree89a544304580569eb019608606359ba7a1166ebb /cmd/geth
parent549f1add296ccfb76d5038316acb4d7c3935221a (diff)
downloaddexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.tar
dexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.tar.gz
dexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.tar.bz2
dexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.tar.lz
dexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.tar.xz
dexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.tar.zst
dexon-aca9d6a1fb4c2b01d1b8f6e1bf165a39d4b9ac8e.zip
cmd/geth: print actual error when --unlock fails
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/accountcmd.go4
-rw-r--r--cmd/geth/accountcmd_test.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
index 6e8d2b7eb..86175d05f 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/geth/accountcmd.go
@@ -181,13 +181,13 @@ func unlockAccount(ctx *cli.Context, accman *accounts.Manager, address string, i
for trials := 0; trials < 3; trials++ {
prompt := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", address, trials+1, 3)
password := getPassPhrase(prompt, false, i, passwords)
- if err := accman.Unlock(account, password); err == nil {
+ if err = accman.Unlock(account, password); err == nil {
glog.V(logger.Info).Infof("Unlocked account %x", account.Address)
return account, password
}
}
// All trials expended to unlock account, bail out
- utils.Fatalf("Failed to unlock account: %s", address)
+ utils.Fatalf("Failed to unlock account %s (%v)", address, err)
return accounts.Account{}, ""
}
diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go
index fa3f73843..440a0cb0b 100644
--- a/cmd/geth/accountcmd_test.go
+++ b/cmd/geth/accountcmd_test.go
@@ -168,7 +168,7 @@ Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 2/3
Passphrase: {{.InputLine "wrong2"}}
Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 3/3
Passphrase: {{.InputLine "wrong3"}}
-Fatal: Failed to unlock account: f466859ead1932d743d622cb74fc058882e8648a
+Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could not decrypt key with given passphrase)
`)
}
@@ -225,6 +225,6 @@ func TestUnlockFlagPasswordFileWrongPassword(t *testing.T) {
"--password", "testdata/wrong-passwords.txt", "--unlock", "0,2")
defer geth.expectExit()
geth.expect(`
-Fatal: Failed to unlock account: 0
+Fatal: Failed to unlock account 0 (could not decrypt key with given passphrase)
`)
}