From a8e791ab8c121ac928a29a23720f94be70bd5c6a Mon Sep 17 00:00:00 2001 From: Oskar Thoren Date: Thu, 28 May 2020 11:40:41 +0800 Subject: [PATCH] Maybe connect to multiple peers Now connnectedpeers is (divide by two?): 0/8/7/6/5/4. Progress? --- waku/node/v2/start_network.nim | 2 +- waku/node/v2/wakunode.nim | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/waku/node/v2/start_network.nim b/waku/node/v2/start_network.nim index 839649b80..2664a07cc 100644 --- a/waku/node/v2/start_network.nim +++ b/waku/node/v2/start_network.nim @@ -41,7 +41,7 @@ proc initNodeCmd(shift: int, staticNodes: seq[string] = @[], master = false, lab address = "/ip4/127.0.0.1/tcp/" & $port hostAddress = MultiAddress.init(address) - echo "ADDRESS", address + info "Address", address # TODO: Need to port shift peerInfo.addrs.add(hostAddress) let id = peerInfo.id diff --git a/waku/node/v2/wakunode.nim b/waku/node/v2/wakunode.nim index 3d2ea2a49..9ad791ae5 100644 --- a/waku/node/v2/wakunode.nim +++ b/waku/node/v2/wakunode.nim @@ -51,20 +51,14 @@ proc dialPeer(p: WakuProto, address: string) {.async.} = # Isn't there just one p instance? Why connected here? p.connected = true -# TODO: Connect to multiple static nodes proc connectToNodes(p: WakuProto, nodes: openArray[string]) = - let peerInfoStr = nodes[0] - info "connectToNodes", node = peerInfoStr - - # XXX: Why is ipfs being replaced by p2p here? - # Whats difference here? We don't have Whisper enodes etc - discard dialPeer(p, peerInfoStr) -# for nodeId in nodes: -# info "connectToNodes nodeid", nodeId -# # TODO: something more user friendly than an assert -# let whisperENode = ENode.fromString(nodeId).expect("correct node") -# -# traceAsyncErrors node.peerPool.connectToNode(newNode(whisperENode)) + for nodeId in nodes: + info "connectToNodes", node = nodeId + # XXX: This seems...brittle + discard dialPeer(p, nodeId) + # Waku 1 + # let whisperENode = ENode.fromString(nodeId).expect("correct node") + # traceAsyncErrors node.peerPool.connectToNode(newNode(whisperENode)) # NOTE: Looks almost identical to beacon_chain/eth2_network.nim proc setupNat(conf: WakuNodeConf): tuple[ip: IpAddress,