refactor(waku utils): Separate waku node start from pairing process

libs/waku_utils/waku_node.nim

@@ -60,6 +60,9 @@ proc startWakuNode*(rng: ref HmacDrbgContext,
                                        some(node.peerManager),
                                        node.topicSubscriptionQueue)
 
+  notice "Starting Waku Node", enr=bootstrapNode, wakuPort=wakuPort,
+      discv5Port=discv5Port
+
   await node.start()
   await node.mountRelay()
   node.peerManager.start()
@@ -73,10 +76,10 @@ proc startWakuNode*(rng: ref HmacDrbgContext,
     let numConnectedPeers = node.peerManager.peerStore[
         ConnectionBook].book.values().countIt(it == Connected)
     if numConnectedPeers >= requiredConnectedPeers:
-      notice "Node is ready", connectedPeers = numConnectedPeers,
+      notice "Waku Node is ready", connectedPeers = numConnectedPeers,
           required = requiredConnectedPeers
       break
-    notice "Waiting for the node to be ready",
+    notice "Waiting for the waku node to be ready",
         connectedPeers = numConnectedPeers, required = requiredConnectedPeers
     await sleepAsync(5000)
 

libs/waku_utils/waku_pair.nim

@@ -20,9 +20,9 @@ type WakuPairResult* = object
   wakuNode*: WakuNode
   wakuHandshakeResult*: HandshakeResult
 
-proc wakuPair*(rng: ref HmacDrbgContext, qr, qrMessageNameTagHex: string,
-               wakuPort, discv5Port: uint16,
-               requiredConnectedPeers: int,
+proc wakuPair*(rng: ref HmacDrbgContext,
+               node: WakuNode,
+               qr, qrMessageNameTagHex: string,
                pubSubTopic: PubsubTopic
     ): Future[WakuPairResult] {.async.} =
   # Initiator static/ephemeral key initialization and commitment
@@ -34,18 +34,13 @@ proc wakuPair*(rng: ref HmacDrbgContext, qr, qrMessageNameTagHex: string,
     # We set the contentTopic from the content topic parameters exchanged in the QR
     contentTopic = initContentTopicFromQr(qr)
 
-  notice "Initializing Waku pairing", wakuPort = wakuPort,
-      discv5Port = discv5Port
+  notice "Initializing Waku pairing"
 
   notice "Initial information parsed from the QR", contentTopic = contentTopic,
       qrMessageNameTag = qrMessageNameTag
 
   var initiatorHSResult: HandshakeResult
 
-  # Start nwaku instance
-  let node = await startWakuNode(rng, wakuPort, discv5Port,
-                                 requiredConnectedPeers)
-
   # Perform the handshake
   initiatorHSResult = await initiatorHandshake(rng, node, pubSubTopic,
                                                contentTopic, qr,