roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/geth: print actual error when --unlock fails

Browse Source
This commit is contained in:
Felix Lange 2016-03-30 22:58:08 +02:00
parent 549f1add29
commit aca9d6a1fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/geth/accountcmd.go
View File

@ -181,13 +181,13 @@ func unlockAccount(ctx *cli.Context, accman *accounts.Manager, address string, i
for trials := 0; trials < 3; trials++ { for trials := 0; trials < 3; trials++ {
prompt := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", address, trials+1, 3) prompt := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", address, trials+1, 3)
password := getPassPhrase(prompt, false, i, passwords) 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) glog.V(logger.Info).Infof("Unlocked account %x", account.Address)
return account, password return account, password
} }
} }
// All trials expended to unlock account, bail out // 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{}, "" return accounts.Account{}, ""
} }

4
cmd/geth/accountcmd_test.go
View File

@ -168,7 +168,7 @@ Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 2/3
Passphrase: {{.InputLine "wrong2"}} Passphrase: {{.InputLine "wrong2"}}
Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 3/3 Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 3/3
Passphrase: {{.InputLine "wrong3"}} 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") "--password", "testdata/wrong-passwords.txt", "--unlock", "0,2")
defer geth.expectExit() defer geth.expectExit()
geth.expect(` geth.expect(`
Fatal: Failed to unlock account: 0 Fatal: Failed to unlock account 0 (could not decrypt key with given passphrase)
`) `)
} }