test quic

Author: vladopajic

.pinned

@@ -8,7 +8,7 @@ json_serialization;https://github.com/status-im/nim-json-serialization@#2b1c5eb1
 metrics;https://github.com/status-im/nim-metrics@#6142e433fc8ea9b73379770a788017ac528d46ff
 ngtcp2;https://github.com/status-im/nim-ngtcp2@#791eb859145f9f268eb23eb9cbe777bdd7699c4d
 nimcrypto;https://github.com/cheatfate/nimcrypto@#19c41d6be4c00b4a2c8000583bd30cf8ceb5f4b1
-quic;https://github.com/vacp2p/nim-quic@#525842aeca6111fd5035568d0f59aa2b338cc29d
+quic;https://github.com/vacp2p/nim-quic@#865e27d550b32b24d708c15f0e3b7591f94a093c
 results;https://github.com/arnetheduck/nim-results@#df8113dda4c2d74d460a8fa98252b0b771bf1f27
 secp256k1;https://github.com/status-im/nim-secp256k1@#f808ed5e7a7bfc42204ec7830f14b7a42b63c284
 serialization;https://github.com/status-im/nim-serialization@#548d0adc9797a10b2db7f788b804330306293088

tests/helpers.nim

@@ -154,7 +154,7 @@ macro checkUntilTimeoutCustom*(
     await checkExpiringInternal()
 
 macro checkUntilTimeout*(code: untyped): untyped =
-  ## Same as `checkUntilTimeoutCustom` but with a default timeout of 2s with 50ms interval.
+  ## Same as `checkUntilTimeoutCustom` but with a default timeout of 30s with 50ms interval.
   ##
   ## Examples:
   ##   ```nim
@@ -175,7 +175,7 @@ macro checkUntilTimeout*(code: untyped): untyped =
   ##       b == 1
   ##   ```
   result = quote:
-    checkUntilTimeoutCustom(2.seconds, 50.milliseconds, `code`)
+    checkUntilTimeoutCustom(30.seconds, 50.milliseconds, `code`)
 
 proc unorderedCompare*[T](a, b: seq[T]): bool =
   if a == b:

tests/pubsub/integration/testfloodsub.nim

@@ -247,11 +247,12 @@ suite "FloodSub Integration":
     # test calling unsubscribeAll for coverage
     for node in nodes:
       node.unsubscribeAll("foobar")
-      check:
+      let n = node
+      checkUntilTimeout:
         # we keep the peers in table
-        FloodSub(node).floodsub["foobar"].len == 9
+        FloodSub(n).floodsub["foobar"].len == 9
         # remove the topic tho
-        node.topics.len == 0
+        n.topics.len == 0
 
   asyncTest "FloodSub message size validation":
     var messageReceived = 0

tests/pubsub/integration/testgossipsubmeshmanagement.nim

@@ -40,7 +40,7 @@ suite "GossipSub Integration - Mesh Management":
 
   asyncTest "Nodes graft peers according to DValues - numberOfNodes > dHigh":
     let
-      numberOfNodes = 15
+      numberOfNodes = 8
       topic = "foobar"
       nodes = generateNodes(numberOfNodes, gossip = true).toGossipSub()
 
@@ -50,17 +50,19 @@ suite "GossipSub Integration - Mesh Management":
 
     let
       expectedNumberOfPeers = numberOfNodes - 1
-      dHigh = 12
+      dHigh = 7
       d = 6
       dLow = 4
 
     for i in 0 ..< numberOfNodes:
       let node = nodes[i]
       checkUntilTimeout:
+        node.fanout.len == 0
         node.gossipsub.getOrDefault(topic).len == expectedNumberOfPeers
-        node.mesh.getOrDefault(topic).len >= dLow and
+        (
+          node.mesh.getOrDefault(topic).len >= dLow and
           node.mesh.getOrDefault(topic).len <= dHigh
-        node.fanout.len == 0
+        )
 
   asyncTest "GossipSub should add remote peer topic subscriptions":
     proc handler(topic: string, data: seq[byte]) {.async.} =
@@ -338,25 +340,21 @@ suite "GossipSub Integration - Mesh Management":
     checkUntilTimeout:
       node0.mesh.getOrDefault(topic).len == dValues.get.d.get
 
-  # TODO: Remove loop when GossipSub tests fully switched to QUIC
-  const transports = @[TransportType.TCP, TransportType.QUIC]
-  for transport in transports:
-    asyncTest "Outbound peers are marked correctly " & $transport:
-      let
-        numberOfNodes = 4
-        topic = "foobar"
-        nodes = generateNodes(numberOfNodes, gossip = true, transport = transport)
-          .toGossipSub()
-
-      startNodesAndDeferStop(nodes)
-
-      await connectNodes(nodes[0], nodes[1]) # Out
-      await connectNodes(nodes[0], nodes[2]) # Out
-      await connectNodes(nodes[3], nodes[0]) # In
-      subscribeAllNodes(nodes, topic, voidTopicHandler)
+  asyncTest "Outbound peers are marked correctly ":
+    let
+      numberOfNodes = 4
+      topic = "foobar"
+      nodes = generateNodes(numberOfNodes, gossip = true).toGossipSub()
 
-      checkUntilTimeout:
-        nodes[0].mesh.outboundPeers(topic) == 2
-        nodes[0].getPeerByPeerId(topic, nodes[1].peerInfo.peerId).outbound == true
-        nodes[0].getPeerByPeerId(topic, nodes[2].peerInfo.peerId).outbound == true
-        nodes[0].getPeerByPeerId(topic, nodes[3].peerInfo.peerId).outbound == false
+    startNodesAndDeferStop(nodes)
+
+    await connectNodes(nodes[0], nodes[1]) # Out
+    await connectNodes(nodes[0], nodes[2]) # Out
+    await connectNodes(nodes[3], nodes[0]) # In
+    subscribeAllNodes(nodes, topic, voidTopicHandler)
+
+    checkUntilTimeout:
+      nodes[0].mesh.outboundPeers(topic) == 2
+      nodes[0].getPeerByPeerId(topic, nodes[1].peerInfo.peerId).outbound == true
+      nodes[0].getPeerByPeerId(topic, nodes[2].peerInfo.peerId).outbound == true
+      nodes[0].getPeerByPeerId(topic, nodes[3].peerInfo.peerId).outbound == false

tests/pubsub/integration/testgossipsubscoring.nim

@@ -83,7 +83,7 @@ suite "GossipSub Integration - Scoring":
     )
     await waitForHeartbeat()
 
-    check:
+    checkUntilTimeout:
       currentRateLimitHits() == rateLimitHits
       nodes[1].switch.isConnected(nodes[0].switch.peerInfo.peerId) == true
 
@@ -96,7 +96,7 @@ suite "GossipSub Integration - Scoring":
     )
     await waitForHeartbeat()
 
-    check:
+    checkUntilTimeout:
       nodes[1].switch.isConnected(nodes[0].switch.peerInfo.peerId) == true
       currentRateLimitHits() == rateLimitHits
 

tests/pubsub/utils.nim

@@ -192,7 +192,7 @@ proc generateNodes*(
     publishThreshold = -1000.0,
     graylistThreshold = -10000.0,
     disconnectBadPeers: bool = false,
-    transport: TransportType = TransportType.TCP,
+    transport: TransportType = TransportType.QUIC,
 ): seq[PubSub] =
   for i in 0 ..< num:
     let switch = newStandardSwitch(
@@ -537,9 +537,9 @@ proc baseTestProcedure*(
 
   block setup:
     for i in 0 ..< 50:
-      if (await nodes[0].publish("foobar", ("Hello!" & $i).toBytes())) == 19:
+      if (await nodes[0].publish("foobar", ("Hello!" & $i).toBytes())) == nodes.len - 1:
         break setup
-      await sleepAsync(10.milliseconds)
+      await sleepAsync(1.seconds)
     check false
 
   check (await nodes[0].publish("foobar", newSeq[byte](2_500_000))) == numPeersFirstMsg