Merge with develop

This commit is contained in:
Zarko Milosevic
2018-12-10 12:17:20 +01:00
parent 41eaf0e31d
commit 32f7e871cc
5 changed files with 12 additions and 12 deletions
+6 -6
View File
@@ -55,13 +55,13 @@ func NewNode(rpcAddr string, options ...func(*Node)) *Node {
func NewNodeWithEventMeterAndRpcClient(rpcAddr string, em eventMeter, rpcClient rpc_client.HTTPClient, options ...func(*Node)) *Node {
n := &Node{
rpcAddr: rpcAddr,
em: em,
rpcClient: rpcClient,
Name: rpcAddr,
quit: make(chan struct{}),
rpcAddr: rpcAddr,
em: em,
rpcClient: rpcClient,
Name: rpcAddr,
quit: make(chan struct{}),
checkIsValidatorInterval: 5 * time.Second,
logger: log.NewNopLogger(),
logger: log.NewNopLogger(),
}
for _, option := range options {