cleaner solution for sharing the queue

status-im · Nov 21, 2019 · bc2b76f · bc2b76f
1 parent f02f358
commit bc2b76f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/eth/p2p/rlpx_protocols/waku_protocol.nim b/eth/p2p/rlpx_protocols/waku_protocol.nim
@@ -100,11 +100,8 @@ proc run(peer: Peer) {.gcsafe, async.}
 proc run(node: EthereumNode, network: WakuNetwork) {.gcsafe, async.}
 
 proc initProtocolState*(network: WakuNetwork, node: EthereumNode) {.gcsafe.} =
-  if node.protocolState(Whisper).isNil:
-    new(network.queue)
-    network.queue[] = initQueue(defaultQueueCapacity)
-  else:
-    network.queue = node.protocolState(Whisper).queue
+  new(network.queue)
+  network.queue[] = initQueue(defaultQueueCapacity)
   network.filters = initTable[string, Filter]()
   network.config.bloom = fullBloom()
   network.config.powRequirement = defaultMinPow
@@ -466,3 +463,6 @@ proc resetMessageQueue*(node: EthereumNode) =
   ##
   ## NOTE: Not something that should be run in normal circumstances.
   node.protocolState(Waku).queue[] = initQueue(defaultQueueCapacity)
+
+proc shareMessageQueue*(node: EthereumNode) =
+  node.protocolState(Waku).queue = node.protocolState(Whisper).queue
diff --git a/tests/p2p/test_waku_bridge.nim b/tests/p2p/test_waku_bridge.nim
@@ -28,6 +28,8 @@ suite "Waku - Whisper bridge tests":
   nodeWakuWhisper.startListening()
   let bridgeNode = newNode(initENode(nodeWakuWhisper.keys.pubKey,
     nodeWakuWhisper.address))
+  nodeWakuWhisper.shareMessageQueue()
+
   waitFor nodeWhisper.peerPool.connectToNode(bridgeNode)
   waitFor nodeWaku.peerPool.connectToNode(bridgeNode)