status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'implicit-subscribe' into devel

This commit is contained in:
Ștefan Talpalaru 2020-02-21 20:32:46 +01:00
parent bd194da3d1 08915ed597
commit 4fe49bc6e2
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/eth2_network.nim
View File

@ -228,7 +228,7 @@ when networkBackend in [libp2p, libp2pDaemon]:
await node.start() await node.start()
proc checkIfConnectedToBootstrapNode {.async.} = proc checkIfConnectedToBootstrapNode {.async.} =
await sleepAsync(10.seconds) await sleepAsync(30.seconds)
if bootstrapEnrs.len > 0 and libp2p_successful_dials.value == 0: if bootstrapEnrs.len > 0 and libp2p_successful_dials.value == 0:
fatal "Failed to connect to any bootstrap node. Quitting", bootstrapEnrs fatal "Failed to connect to any bootstrap node. Quitting", bootstrapEnrs
quit 1 quit 1

4
beacon_chain/libp2p_backend.nim
View File

@ -192,10 +192,6 @@ proc dialPeer*(node: Eth2Node, peerInfo: PeerInfo) {.async.} =
debug "Initializing connection" debug "Initializing connection"
await initializeConnection(peer) await initializeConnection(peer)
# TODO: This should happen automatically in the future in nim-libp2p
debug "Subscribing to pubsub"
await peer.network.switch.subscribeToPeer(peer.info)
inc libp2p_successful_dials inc libp2p_successful_dials
debug "Network handshakes completed" debug "Network handshakes completed"

2
vendor/nim-libp2p vendored

@ -1 +1 @@
Subproject commit cb156f3260d35c49b0039ee73c623cdf95658888 Subproject commit 6a7f9f058c04ecdfd26e5dbfd8df88221b8511e7