poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14897 from karalabe/cardinal-sin 

cmd/puppeth: remove wrapping loop in single reads
This commit is contained in:
Péter Szilágyi 2017-08-05 00:34:05 +02:00 committed by GitHub
parent 350bb6d9ca 455fcc8309
commit ca436f4b90
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/puppeth/wizard.go
View File

@ -106,7 +106,6 @@ func (w *wizard) readString() string {
// readDefaultString reads a single line from stdin, trimming if from spaces. If
// an empty line is entered, the default value is returned.
func (w *wizard) readDefaultString(def string) string {
for {
fmt.Printf("> ")
text, err := w.in.ReadString('\n')
if err != nil {
@ -116,7 +115,6 @@ func (w *wizard) readDefaultString(def string) string {
return text
}
return def
}
}
// readInt reads a single line from stdin, trimming if from spaces, enforcing it
@ -207,7 +205,6 @@ func (w *wizard) readDefaultFloat(def float64) float64 {
// readPassword reads a single line from stdin, trimming it from the trailing new
// line and returns it. The input will not be echoed.
func (w *wizard) readPassword() string {
for {
fmt.Printf("> ")
text, err := terminal.ReadPassword(int(syscall.Stdin))
if err != nil {
@ -215,7 +212,6 @@ func (w *wizard) readPassword() string {
}
fmt.Println()
return string(text)
}
}
// readAddress reads a single line from stdin, trimming if from spaces and converts