cmd/puppeth: make it possible to have pw-protected keyfiles (#22148)

cmd/puppeth/wizard_intro.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
 
 	"github.com/ethereum/go-ethereum/log"
 )
@@ -80,14 +79,8 @@ func (w *wizard) run() {
 	} else if err := json.Unmarshal(blob, &w.conf); err != nil {
 		log.Crit("Previous configuration corrupted", "path", w.conf.path, "err", err)
 	} else {
-		// Dial all previously known servers concurrently
-		var pend sync.WaitGroup
+		// Dial all previously known servers
 		for server, pubkey := range w.conf.Servers {
-			pend.Add(1)
-
-			go func(server string, pubkey []byte) {
-				defer pend.Done()
-
 			log.Info("Dialing previously configured server", "server", server)
 			client, err := dial(server, pubkey)
 			if err != nil {
@@ -96,9 +89,7 @@ func (w *wizard) run() {
 			w.lock.Lock()
 			w.servers[server] = client
 			w.lock.Unlock()
-			}(server, pubkey)
 		}
-		pend.Wait()
 		w.networkStats()
 	}
 	// Basics done, loop ad infinitum about what to do