refactor(waku utils): Minor improvements

- Fix types
- Remove unused variables
- Formating changes

libs/waku-utils/example/js-waku/initiator.nim

@@ -27,8 +27,6 @@ const
 proc exampleJSWaku(rng: ref HmacDrbgContext) {.async.} =
   setupLogLevel(logging.LogLevel.NOTICE)
 
-  var readyForFinalization = false
-
   ################################
   # Initiator static/ephemeral key initialization and commitment
   let initiatorInfo = initAgentKeysAndCommitment(rng)
@@ -36,7 +34,6 @@ proc exampleJSWaku(rng: ref HmacDrbgContext) {.async.} =
   # Read the QR
   let
     qr = readFile("build/data/qr.txt")
-    (_, _, _, readEphemeralKey, _) = fromQr(qr)
     qrMessageNameTag = fromHex(readFile("build/data/qrMessageNametag.txt"))
     # We set the contentTopic from the content topic parameters exchanged in the QR
     contentTopic = initContentTopicFromQr(qr)
@@ -47,9 +44,7 @@ proc exampleJSWaku(rng: ref HmacDrbgContext) {.async.} =
   notice "Initial information parsed from the QR", contentTopic = contentTopic,
       qrMessageNameTag = qrMessageNameTag
 
-  var
-    initiatorHS = initHS(initiatorInfo, qr, true)
-    initiatorHSResult: HandshakeResult
+  var initiatorHSResult: HandshakeResult
 
   # Start nwaku instance
   let node = await startWakuNode(rng, wakuPort, discv5Port,
@@ -71,13 +66,13 @@ proc exampleJSWaku(rng: ref HmacDrbgContext) {.async.} =
 
   var i = 150
   while i > 0:
-    realMessage = @[(byte)42,42,42,42]
+    realMessage = @[(byte)42, 42, 42, 42]
     payload = writeMessage(initiatorHSResult, realMessage,
                            initiatorHSResult.nametagsOutbound)
 
-    let wakuMsg = encodePayloadV2(  payload, contentTopic)
+    let wakuMsg = encodePayloadV2(payload, contentTopic)
     await node.publish(some(pubSubTopic), wakuMsg.get)
-    notice "Sending real message", payload=payload.messageNametag
+    notice "Sending real message", payload = payload.messageNametag
     await sleepAsync(100)
     i = i - 1
 
@@ -87,7 +82,7 @@ proc exampleJSWaku(rng: ref HmacDrbgContext) {.async.} =
   let
     message1 = @[(byte)1, 42, 42, 42]
     payload1 = writeMessage(initiatorHSResult, message1,
-                                initiatorHSResult.nametagsOutbound)
+                            initiatorHSResult.nametagsOutbound)
     wakuMessage1 = encodePayloadV2(payload1, contentTopic)
   notice "Sending first message"
   await node.publish(some(pubSubTopic), wakuMessage1.get)

libs/waku-utils/example/nwaku/agentA.nim

@@ -25,16 +25,12 @@ const
 
 proc exampleNwakuAgentA(rng: ref HmacDrbgContext) {.async.} =
   setupLogLevel(logging.LogLevel.NOTICE)
-
-  var readyForFinalization = false
-
   # agentA static/ephemeral key initialization and commitment
   let agentAInfo = initAgentKeysAndCommitment(rng)
 
   # Read the QR
   let
     qr = readFile("build/data/qr.txt")
-    (_, _, _, readEphemeralKey, _) = fromQr(qr)
     qrMessageNameTag = cast[seq[byte]](readFile("build/data/qrMessageNametag.txt"))
     # We set the contentTopic from the content topic parameters exchanged in the QR
     contentTopic = initContentTopicFromQr(qr)
@@ -45,11 +41,9 @@ proc exampleNwakuAgentA(rng: ref HmacDrbgContext) {.async.} =
   notice "Initial information parsed from the QR", contentTopic = contentTopic,
       qrMessageNameTag = qrMessageNameTag
 
-  var
-    agentAHS = initHS(agentAInfo, qr, true)
-    agentAHSResult: HandshakeResult
+  var agentAHSResult: HandshakeResult
 
-   # Start nwaku instance
+  # Start nwaku instance
   let node = await startWakuNode(rng, wakuPort, discv5Port,
                                  requiredConnectedPeers)
 

libs/waku-utils/example/nwaku/agentB.nim

@@ -30,14 +30,12 @@ proc exampleNwakuAgentB(rng: ref HmacDrbgContext) {.async.} =
   var readyForFinalization = false
 
   let agentBInfo = initAgentKeysAndCommitment(rng)
-  let r = agentBInfo.commitment
 
   #########################
   # Content Topic information
-  let contentTopicInfo = ContentTopicInfo(
-    applicationName: "waku-noise-sessions",
-    applicationVersion: "0.1",
-    shardId: "10", )
+  let contentTopicInfo = ContentTopicInfo(applicationName: "waku-noise-sessions",
+                                          applicationVersion: "0.1",
+                                          shardId: "10", )
 
   let (qr, qrMessageNametag) = initQr(rng, contentTopicInfo, agentBInfo)
   writeFile("build/data/qr.txt", qr)

libs/waku-utils/waku_handshake_utils.nim

@@ -183,9 +183,7 @@ proc handleHandShakeMsg*(rng: ref HmacDrbgContext,
                          initiatorHS: var HandshakeState,
                          initiatorMessageNametag: var MessageNametag) =
   notice "Received handshake message for step:", step = step,
-         psTopic = pubSubTopic,
-         contentTopic = contentTopic,
-         payload = payload
+      psTopic = pubSubTopic, contentTopic = contentTopic, payload = payload
   notice "Handling handshake message for step:", step = step
   initiatorStep = stepHandshake(rng[], initiatorHS,
                                 readPayloadV2 = payload,

libs/waku-utils/waku_node.nim

@@ -13,8 +13,9 @@ import
   waku/common/[logging, protobuf]
 
 proc startWakuNode*(rng: ref HmacDrbgContext,
-                    wakuPort, discv5Port, requiredConnectedPeers: int
-    ):Future[WakuNode] {.async.} =
+                    wakuPort, discv5Port: uint16,
+                    requiredConnectedPeers: int
+    ): Future[WakuNode] {.async.} =
   let
     bootstrapNode = "enr:-P-4QGVNANzbhCI49du6Moyw98AjuMhKoOpE_Jges9JlCq-I" &
                     "CAVadktjfcNpuhQgT0g1cu86_S3nbM7eYkCsqDAQG7UBgmlkgnY0" &
@@ -62,7 +63,7 @@ proc startWakuNode*(rng: ref HmacDrbgContext,
   node.peerManager.start()
 
   (await wakuDiscv5.start()).isOkOr:
-    error "failed to start discv5", error = error
+    error "Failed to start discv5", error = error
     quit(1)
 
   # Wait for a minimum of peers to be connected, otherwise messages wont be gossiped