From 20652f056a600ca712b9e547d7be2deb71224dc1 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 3 May 2023 09:32:57 +0200 Subject: [PATCH] fix: remove remaining Circuit v1 Go tests --- test/circuit/v1/browser.js | 70 -------------------------------------- 1 file changed, 70 deletions(-) diff --git a/test/circuit/v1/browser.js b/test/circuit/v1/browser.js index eb5fa6ac..9455e7c2 100644 --- a/test/circuit/v1/browser.js +++ b/test/circuit/v1/browser.js @@ -62,17 +62,6 @@ export default { ]), connect: connWithTimeout(1500) }, - 'browser-js-go': { - /** - * @param {Factory} factory - */ - create: (factory) => Promise.all([ - createProc([], factory), - createJs([randomWsAddr], factory), - createGo([randomWsAddr], factory) - ]), - connect: connWithTimeout(1500) - }, 'js-go-browser': { skip: () => true, // FIXME when we have circuit v2 in js-ipfs and webrtc signaling /** @@ -114,41 +103,6 @@ export default { ]), connect: connWithTimeout(1500) }, - 'go-js-browser': { - /** - * @param {Factory} factory - */ - create: (factory) => Promise.all([ - createGo([randomWsAddr], factory), - createJs([randomWsAddr], factory), - createProc([], factory) - ]), - connect: connWithTimeout(1500) - }, - 'go-browser-browser': { - /** - * @param {Factory} factory - */ - create: (factory) => Promise.all([ - createGo([randomWsAddr], factory), - createProc(['/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'], factory), - createProc(['/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'], factory) - ]), - /** - * @param {Controller} nodeA - * @param {Controller} nodeB - * @param {Controller} relay - */ - connect: async (nodeA, nodeB, relay) => { - await relay.api.swarm.connect(await getWsAddr(nodeA.api)) - await relay.api.swarm.connect(await getWrtcStarAddr(nodeB.api)) - // TODO: needed until https://github.com/ipfs/interop/issues/17 is resolved - await delay(5000) - const nodeBCircuitAddr = multiaddr(`${await getWrtcStarAddr(relay.api)}/p2p-circuit/p2p/${nodeB.peer.id.toString()}`) - await nodeA.api.swarm.connect(nodeBCircuitAddr) - }, - skip: () => true // go-ipfs does not know what p2p-webrtc-star is - }, 'js-browser-browser': { /** * @param {Factory} factory @@ -173,30 +127,6 @@ export default { }, skip: () => isWebWorker // no webrtc support in webworkers }, - 'browser-browser-go': { - /** - * @param {Factory} factory - */ - create: (factory) => Promise.all([ - createProc(['/ip4/127.0.0.1/tcp/24642/wss/p2p-webrtc-star'], factory), - createProc(['/ip4/127.0.0.1/tcp/24642/wss/p2p-webrtc-star'], factory), - createGo([randomWsAddr], factory) - ]), - /** - * @param {Controller} nodeA - * @param {Controller} nodeB - * @param {Controller} relay - */ - connect: async (nodeA, nodeB, relay) => { - await relay.api.swarm.connect(await getWrtcStarAddr(nodeA.api)) - await relay.api.swarm.connect(await getWsAddr(nodeB.api)) - // TODO: needed until https://github.com/ipfs/interop/issues/17 is resolved - await delay(5000) - const nodeBCircuitAddr = multiaddr(`${await getWrtcStarAddr(relay.api)}/p2p-circuit/p2p/${(await nodeB.api.id()).id.toString()}`) - await nodeA.api.swarm.connect(nodeBCircuitAddr) - }, - skip: () => isWebWorker // no webrtc support in webworkers - }, 'browser-browser-js': { /** * @param {Factory} factory