resolve merge issues

Author: chaitanyaprem

waku/waku_mix/protocol.nim

@@ -1,6 +1,6 @@
 {.push raises: [].}
 
-import chronicles, std/options, chronos, results, metrics
+import chronicles, std/[options, sequtils], chronos, results, metrics
 
 import
   libp2p/crypto/curve25519,
@@ -11,7 +11,7 @@ import
   libp2p/protocols/mix/mix_metrics,
   libp2p/protocols/mix/delay_strategy,
   libp2p/protocols/mix/spam_protection,
-  libp2p/[multiaddress, peerid],
+  libp2p/[multiaddress, multicodec, peerid],
   eth/common/keys
 
 import
@@ -70,9 +70,19 @@ proc processBootNodes(
       error "Failed to parse multiaddress", multiAddr = node.multiAddr, error = error
       continue
 
-    let mixPubInfo = MixPubInfo.init(peerId, multiAddr, node.pubKey, peerPubKey.skkey)
-    mix.nodePool.add(mixPubInfo)
-    count += 1
+    # Strip /p2p/ suffix for mix protocol - it only needs network address
+    var networkAddr = multiAddr
+    try:
+      if multiAddr.contains(multiCodec("p2p")).get():
+        let parts = multiAddr.items().toSeq()
+        var addrWithoutP2P = MultiAddress()
+        for i in 0 ..< parts.len - 1:
+          let part = parts[i].valueOr:
+            continue
+          addrWithoutP2P = addrWithoutP2P & part
+        networkAddr = addrWithoutP2P
+    except CatchableError as e:
+      warn "Failed to strip /p2p/ from multiaddr", error = e.msg
 
     peermgr.addPeer(
       RemotePeerInfo.init(peerId, @[networkAddr], mixPubKey = some(node.pubKey))
@@ -124,7 +134,6 @@ proc new*(
   )
   procCall MixProtocol(m).init(
     localMixNodeInfo,
-    initTable,
     peermgr.switch,
     spamProtection = Opt.some(SpamProtection(spamProtection)),
     delayStrategy =
@@ -282,17 +291,10 @@ method start*(mix: WakuMix) {.async.} =
         else:
           trace "Saved spam protection tree to disk"
 
-  mix.nodePoolLoopHandle = mix.startMixNodePoolMgr()
-
 method stop*(mix: WakuMix) {.async.} =
   # Stop spam protection
   if not mix.mixRlnSpamProtection.isNil():
     await mix.mixRlnSpamProtection.stop()
     debug "Spam protection stopped"
 
-  if mix.nodePoolLoopHandle.isNil():
-    return
-  await mix.nodePoolLoopHandle.cancelAndWait()
-  mix.nodePoolLoopHandle = nil
-
 # Mix Protocol