tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Holst Swende 2021-11-02 13:21:25 +01:00 committed by GitHub
parent 178debe435
commit f49e90e32c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/puppeth/wizard_intro.go
View File

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