Merge branch 'master' of github.com:status-im/nimbus

This commit is contained in:
Ștefan Talpalaru 2020-04-09 01:16:25 +02:00
commit a27f0491d2
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 3 additions and 0 deletions

View File

@ -7,6 +7,7 @@ type
none none
prod prod
staging staging
test
WakuNodeConf* = object WakuNodeConf* = object
logLevel* {. logLevel* {.

View File

@ -96,6 +96,7 @@ proc run(config: WakuNodeConf) =
let bootnodes = if config.bootnodes.len > 0: setBootNodes(config.bootnodes) let bootnodes = if config.bootnodes.len > 0: setBootNodes(config.bootnodes)
elif config.fleet == prod: setBootNodes(StatusBootNodes) elif config.fleet == prod: setBootNodes(StatusBootNodes)
elif config.fleet == staging: setBootNodes(StatusBootNodesStaging) elif config.fleet == staging: setBootNodes(StatusBootNodesStaging)
elif config.fleet == test : setBootNodes(StatusBootNodesTest)
else: @[] else: @[]
traceAsyncErrors node.connectToNetwork(bootnodes, not config.noListen, traceAsyncErrors node.connectToNetwork(bootnodes, not config.noListen,
@ -106,6 +107,7 @@ proc run(config: WakuNodeConf) =
if config.staticnodes.len > 0: connectToNodes(node, config.staticnodes) if config.staticnodes.len > 0: connectToNodes(node, config.staticnodes)
elif config.fleet == prod: connectToNodes(node, WhisperNodes) elif config.fleet == prod: connectToNodes(node, WhisperNodes)
elif config.fleet == staging: connectToNodes(node, WhisperNodesStaging) elif config.fleet == staging: connectToNodes(node, WhisperNodesStaging)
elif config.fleet == test: connectToNodes(node, WhisperNodesTest)
if config.rpc: if config.rpc:
let ta = initTAddress(config.rpcAddress, let ta = initTAddress(config.rpcAddress,