chore: ensure we get the right number of connections

Author: achingbrain

test/go-gossipsub.spec.ts

@@ -13,7 +13,6 @@ import {
 import type { Message, SubscriptionChangeData } from '@libp2p/interfaces/pubsub'
 import type { RPC } from '../ts/message/rpc.js'
 import type { ConnectionManagerEvents } from '@libp2p/interfaces/connection-manager'
-import { pEvent } from 'p-event'
 import pWaitFor from 'p-wait-for'
 import { Components } from '@libp2p/interfaces/components'
 import { sparseConnect,
@@ -98,13 +97,24 @@ const checkReceivedMessage =
       node.getPubSub().addEventListener('message', cb)
     })
 
-const awaitEvents = async <Events = GossipsubEvents> (emitter: EventEmitter<Events>, event: keyof Events, number: number, timeout = 10000) => {
-  for (let i = 0; i < number; i++) {
-    // @ts-expect-error pEvent types are looser than the sig of this function
-    await pEvent(emitter, event, {
-      timeout
-    })
-  }
+const awaitEvents = async <Events = GossipsubEvents> (emitter: EventEmitter<Events>, event: keyof Events, number: number, timeout = 30000) => {
+  return new Promise<void>((resolve, reject) => {
+    let cb: () => void
+    let counter = 0
+    const t = setTimeout(() => {
+      emitter.removeEventListener(event, cb)
+      reject(new Error(`${counter} of ${number} '${event}' events received after ${timeout}ms`))
+    }, timeout)
+    cb = () => {
+      counter++
+      if (counter >= number) {
+        clearTimeout(t)
+        emitter.removeEventListener(event, cb)
+        resolve()
+      }
+    }
+    emitter.addEventListener(event, cb)
+  })
 }
 
 describe('go-libp2p-pubsub gossipsub tests', function () {

test/utils/create-pubsub.ts

@@ -68,17 +68,16 @@ export const connectAllPubSubNodes = async (components: Components[]) => {
 }
 
 /**
- * Connect some gossipsub nodes to others
+ * For every node in `gss`, connect it to `num` other nodes in `gss`
  *
  * @param {Gossipsub[]} gss
- * @param {number} num - number of peers to connect
+ * @param {number} num - number of peers to connect each node to
  */
  export async function connectSome (gss: Components[], num: number) {
   for (let i = 0; i < gss.length; i++) {
-    for (let j = 0; j < num; j++) {
+    while (gss[i].getConnectionManager().getConnections().length < num) {
       const n = Math.floor(Math.random() * gss.length)
       if (n === i) {
-        j--
         continue
       }
 
@@ -92,5 +91,5 @@ export async function sparseConnect (gss: Components[]) {
 }
 
 export async function denseConnect (gss: Components[]) {
-  await connectSome(gss, 10)
+  await connectSome(gss, Math.min(gss.length -1, 10))
 }