status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/puppeth: remove wrapping loop in single reads

This commit is contained in:
Péter Szilágyi 2017-08-04 17:00:22 +02:00
parent 0cc9b8791e
commit 455fcc8309
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
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 // readDefaultString reads a single line from stdin, trimming if from spaces. If
// an empty line is entered, the default value is returned. // an empty line is entered, the default value is returned.
func (w *wizard) readDefaultString(def string) string { func (w *wizard) readDefaultString(def string) string {
for {
fmt.Printf("> ") fmt.Printf("> ")
text, err := w.in.ReadString('\n') text, err := w.in.ReadString('\n')
if err != nil { if err != nil {
@ -116,7 +115,6 @@ func (w *wizard) readDefaultString(def string) string {
return text return text
} }
return def return def
}
} }
// readInt reads a single line from stdin, trimming if from spaces, enforcing it // 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 // readPassword reads a single line from stdin, trimming it from the trailing new
// line and returns it. The input will not be echoed. // line and returns it. The input will not be echoed.
func (w *wizard) readPassword() string { func (w *wizard) readPassword() string {
for {
fmt.Printf("> ") fmt.Printf("> ")
text, err := terminal.ReadPassword(int(syscall.Stdin)) text, err := terminal.ReadPassword(int(syscall.Stdin))
if err != nil { if err != nil {
@ -215,7 +212,6 @@ func (w *wizard) readPassword() string {
} }
fmt.Println() fmt.Println()
return string(text) return string(text)
}
} }
// readAddress reads a single line from stdin, trimming if from spaces and converts // readAddress reads a single line from stdin, trimming if from spaces and converts