From 642357f111666408d52b15a59e1d9b5ea59794dc Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Sun, 3 Dec 2023 08:23:22 +0000
Subject: [PATCH 1/2] chore: re-enable firefox webworker tests

---
 packages/interop/package.json         |  1 +
 packages/interop/test/bitswap.spec.ts | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/interop/package.json b/packages/interop/package.json
index c75c60f..0dda880 100644
--- a/packages/interop/package.json
+++ b/packages/interop/package.json
@@ -44,6 +44,7 @@
     "test:chrome": "aegir test -t browser --cov",
     "test:chrome-webworker": "aegir test -t webworker",
     "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
     "test:node": "aegir test -t node --cov",
     "test:electron-main": "aegir test -t electron-main"
   },
diff --git a/packages/interop/test/bitswap.spec.ts b/packages/interop/test/bitswap.spec.ts
index 9104246..222e8fc 100644
--- a/packages/interop/test/bitswap.spec.ts
+++ b/packages/interop/test/bitswap.spec.ts
@@ -19,8 +19,19 @@ describe('unixfs bitswap interop', () => {
     unixFs = unixfs(helia)
     kubo = await createKuboNode()
 
+    const identify = new Promise<void>((resolve) => {
+      helia.libp2p.addEventListener('peer:identify', (evt) => {
+        if (evt.detail.peerId.equals(kubo.peer.id)) {
+          resolve()
+        }
+      })
+    })
+
     // connect helia to kubo
     await helia.libp2p.dial(kubo.peer.addresses)
+
+    // wait for identify to complete
+    await identify
   })
 
   afterEach(async () => {

From ee8183321d6671c9043645d150f9fb0b5f3af047 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Sun, 3 Dec 2023 09:49:45 +0000
Subject: [PATCH 2/2] chore: disable peer discovery

---
 packages/interop/test/bitswap.spec.ts                 | 11 -----------
 .../interop/test/fixtures/create-helia.browser.ts     |  5 ++++-
 packages/interop/test/fixtures/create-helia.ts        |  3 +++
 packages/interop/test/fixtures/create-kubo.ts         |  3 +++
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/interop/test/bitswap.spec.ts b/packages/interop/test/bitswap.spec.ts
index 222e8fc..9104246 100644
--- a/packages/interop/test/bitswap.spec.ts
+++ b/packages/interop/test/bitswap.spec.ts
@@ -19,19 +19,8 @@ describe('unixfs bitswap interop', () => {
     unixFs = unixfs(helia)
     kubo = await createKuboNode()
 
-    const identify = new Promise<void>((resolve) => {
-      helia.libp2p.addEventListener('peer:identify', (evt) => {
-        if (evt.detail.peerId.equals(kubo.peer.id)) {
-          resolve()
-        }
-      })
-    })
-
     // connect helia to kubo
     await helia.libp2p.dial(kubo.peer.addresses)
-
-    // wait for identify to complete
-    await identify
   })
 
   afterEach(async () => {
diff --git a/packages/interop/test/fixtures/create-helia.browser.ts b/packages/interop/test/fixtures/create-helia.browser.ts
index f94bc9d..be42495 100644
--- a/packages/interop/test/fixtures/create-helia.browser.ts
+++ b/packages/interop/test/fixtures/create-helia.browser.ts
@@ -14,7 +14,6 @@ export async function createHeliaNode (config: Libp2pOptions = {}): Promise<Heli
   const blockstore = new MemoryBlockstore()
   const datastore = new MemoryDatastore()
 
-  // dial-only in the browser until webrtc browser-to-browser arrives
   const libp2p = await createLibp2p({
     transports: [
       webSockets({
@@ -34,6 +33,10 @@ export async function createHeliaNode (config: Libp2pOptions = {}): Promise<Heli
     connectionGater: {
       denyDialMultiaddr: async () => false
     },
+    connectionManager: {
+      minConnections: 0
+    },
+    peerDiscovery: [],
     ...config
   })
 
diff --git a/packages/interop/test/fixtures/create-helia.ts b/packages/interop/test/fixtures/create-helia.ts
index a2b769c..801e280 100644
--- a/packages/interop/test/fixtures/create-helia.ts
+++ b/packages/interop/test/fixtures/create-helia.ts
@@ -27,6 +27,9 @@ export async function createHeliaNode (config: Libp2pOptions = {}): Promise<Heli
     services: {
       identify: identifyService()
     },
+    connectionManager: {
+      minConnections: 0
+    },
     ...config
   })
 
diff --git a/packages/interop/test/fixtures/create-kubo.ts b/packages/interop/test/fixtures/create-kubo.ts
index a19ed1e..24aa069 100644
--- a/packages/interop/test/fixtures/create-kubo.ts
+++ b/packages/interop/test/fixtures/create-kubo.ts
@@ -18,6 +18,9 @@ export async function createKuboNode (options: ControllerOptions<'go'> = {}): Pr
             '/ip4/0.0.0.0/tcp/4001',
             '/ip4/0.0.0.0/tcp/4002/ws'
           ]
+        },
+        Routing: {
+          Type: 'none'
         }
       }
     }