diff options
author | Elad <theman@elad.im> | 2019-03-15 13:20:21 +0800 |
---|---|---|
committer | Viktor TrĂ³n <viktor.tron@gmail.com> | 2019-03-15 13:20:21 +0800 |
commit | df488975bd4bc514a01a3157d52dafd0118a4a05 (patch) | |
tree | f0a97a12da5672c12cf143ed3846d978eb24599a /cmd/utils | |
parent | 91eec1251c06727581063cd7e942ba913d806971 (diff) | |
download | go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.tar go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.tar.gz go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.tar.bz2 go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.tar.lz go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.tar.xz go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.tar.zst go-tangerine-df488975bd4bc514a01a3157d52dafd0118a4a05.zip |
cmd/swarm: dont connect to bootnodes in tests (#19270)
* cmd/swarm: dont connect to bootnodes in tests
* cmd/utils: check for empty string when parsing enode
Diffstat (limited to 'cmd/utils')
-rw-r--r-- | cmd/utils/flags.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b648f958b..e00f92fa7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -773,6 +773,7 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) { node, err := enode.ParseV4(url) if err != nil { log.Crit("Bootstrap URL invalid", "enode", url, "err", err) + continue } cfg.BootstrapNodes = append(cfg.BootstrapNodes, node) } @@ -800,12 +801,14 @@ func setBootstrapNodesV5(ctx *cli.Context, cfg *p2p.Config) { cfg.BootstrapNodesV5 = make([]*discv5.Node, 0, len(urls)) for _, url := range urls { - node, err := discv5.ParseNode(url) - if err != nil { - log.Error("Bootstrap URL invalid", "enode", url, "err", err) - continue + if url != "" { + node, err := discv5.ParseNode(url) + if err != nil { + log.Error("Bootstrap URL invalid", "enode", url, "err", err) + continue + } + cfg.BootstrapNodesV5 = append(cfg.BootstrapNodesV5, node) } - cfg.BootstrapNodesV5 = append(cfg.BootstrapNodesV5, node) } } |