Merge pull request #14897 from karalabe/cardinal-sin

cmd/puppeth: remove wrapping loop in single reads
pull/14905/head
Péter Szilágyi 7 years ago committed by GitHub
commit ca436f4b90
  1. 4
      cmd/puppeth/wizard.go

@ -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 {
@ -117,7 +116,6 @@ func (w *wizard) readDefaultString(def string) string {
}
return def
}
}
// readInt reads a single line from stdin, trimming if from spaces, enforcing it
// to parse into an integer.
@ -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 {
@ -216,7 +213,6 @@ func (w *wizard) readPassword() string {
fmt.Println()
return string(text)
}
}
// readAddress reads a single line from stdin, trimming if from spaces and converts
// it to an Ethereum address.

Loading…
Cancel
Save