diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-11-28 19:34:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 19:34:14 +0800 |
| commit | e323ed5a9a82a2ea603d921492e5109a5ce4e7d2 (patch) | |
| tree | e1add990a912fb11614951137fa2488a27440ce0 | |
| parent | 6bb61ee9ef7be8d8d923560513ccd1881903a29b (diff) | |
| parent | 62dc530773fa8382275e1d7f3b28086f5c66739b (diff) | |
| download | go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.tar go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.tar.gz go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.tar.bz2 go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.tar.lz go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.tar.xz go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.tar.zst go-tangerine-e323ed5a9a82a2ea603d921492e5109a5ce4e7d2.zip | |
Merge pull request #15557 from MaximilianMeister/bootnodes-toml
cmd/utils: bootstrap nodes in config file were not respected
| -rw-r--r-- | cmd/utils/flags.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 0c89d9a4c..aa999eaae 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -584,6 +584,8 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) { urls = params.TestnetBootnodes case ctx.GlobalBool(RinkebyFlag.Name): urls = params.RinkebyBootnodes + case cfg.BootstrapNodes != nil: + return // already set, don't apply defaults. } cfg.BootstrapNodes = make([]*discover.Node, 0, len(urls)) |