[release/1.4.6] cmd/geth, console: fix reviewer issues

(cherry picked from commit da729e5b38)
This commit is contained in:
Péter Szilágyi
2016-05-30 17:30:17 +03:00
parent 7c90a2e42e
commit 5904d58a96
6 changed files with 68 additions and 49 deletions

View File

@ -216,12 +216,12 @@ func getPassPhrase(prompt string, confirmation bool, i int, passwords []string)
if prompt != "" {
fmt.Println(prompt)
}
password, err := console.TerminalPrompter.PromptPassword("Passphrase: ")
password, err := console.Stdin.PromptPassword("Passphrase: ")
if err != nil {
utils.Fatalf("Failed to read passphrase: %v", err)
}
if confirmation {
confirm, err := console.TerminalPrompter.PromptPassword("Repeat passphrase: ")
confirm, err := console.Stdin.PromptPassword("Repeat passphrase: ")
if err != nil {
utils.Fatalf("Failed to read passphrase confirmation: %v", err)
}

View File

@ -117,7 +117,7 @@ func exportChain(ctx *cli.Context) {
}
func removeDB(ctx *cli.Context) {
confirm, err := console.TerminalPrompter.PromptConfirm("Remove local database?")
confirm, err := console.Stdin.PromptConfirm("Remove local database?")
if err != nil {
utils.Fatalf("%v", err)
}

View File

@ -236,7 +236,7 @@ participating.
app.After = func(ctx *cli.Context) error {
logger.Flush()
debug.Exit()
console.TerminalPrompter.Close() // Resets terminal mode.
console.Stdin.Close() // Resets terminal mode.
return nil
}
}