diff --git a/package-lock.json b/package-lock.json index 691eaf0a..a60309b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,7 @@ "ipfs-interop": "bin/ipfs-interop.js" }, "devDependencies": { - "go-ipfs": "^0.18.1", + "go-ipfs": "^0.19.1", "ipfs": "^0.66.0", "ipfs-http-client": "^60.0.0", "kubo-rpc-client": "^3.0.0" @@ -12129,9 +12129,9 @@ } }, "node_modules/go-ipfs": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.18.1.tgz", - "integrity": "sha512-hXfjQRqet/H8mTSQVKiuTSMrvjv8cAGQMHbr12DHAHGsSMS9IuGCOntkVEhnNOnmP/WXcrxRVxLu6xz/mPLlZg==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.19.1.tgz", + "integrity": "sha512-WDqkOgQBh96XRriJPoNFIXsRg8inb0mZb5cgcEnDyuJbLhJaefdE2BnxzsEsfaDFLI+4Z1EFCRMtaO2Bvf6CHw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -37027,9 +37027,9 @@ } }, "go-ipfs": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.18.1.tgz", - "integrity": "sha512-hXfjQRqet/H8mTSQVKiuTSMrvjv8cAGQMHbr12DHAHGsSMS9IuGCOntkVEhnNOnmP/WXcrxRVxLu6xz/mPLlZg==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.19.1.tgz", + "integrity": "sha512-WDqkOgQBh96XRriJPoNFIXsRg8inb0mZb5cgcEnDyuJbLhJaefdE2BnxzsEsfaDFLI+4Z1EFCRMtaO2Bvf6CHw==", "dev": true, "requires": { "cachedir": "^2.3.0", diff --git a/package.json b/package.json index e883c555..5261d257 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "wherearewe": "^2.0.1" }, "devDependencies": { - "go-ipfs": "^0.18.1", + "go-ipfs": "^0.19.1", "ipfs": "^0.66.0", "ipfs-http-client": "^60.0.0", "kubo-rpc-client": "^3.0.0" diff --git a/test/circuit/v1/browser.js b/test/circuit/v1/browser.js index eb5fa6ac..93fd79a5 100644 --- a/test/circuit/v1/browser.js +++ b/test/circuit/v1/browser.js @@ -5,8 +5,6 @@ import delay from 'delay' import { isWebWorker } from 'wherearewe' import { createJs, - createGo, - createGoRelay, createProc, connWithTimeout, randomWsAddr, @@ -21,36 +19,6 @@ import { multiaddr } from '@multiformats/multiaddr' */ export default { - 'browser-go-js': { - skip: () => true, // FIXME when we have circuit v2 in js-ipfs and webrtc signaling - /** - * @param {Factory} factory - */ - create: async (factory) => { - const relay = await createGoRelay([randomWsAddr], factory) - return Promise.all([ - createProc([], factory), - relay, - createJs([randomWsAddr], factory, relay) - ]) - }, - connect: connWithTimeout(1500) - }, - 'browser-go-go': { - skip: () => true, // FIXME when we have circuit v2 in js-ipfs and webrtc signaling - /** - * @param {Factory} factory - */ - create: async (factory) => { - const relay = await createGoRelay([randomWsAddr], factory) - return Promise.all([ - createProc([], factory), - relay, - createGo([randomWsAddr], factory, relay) - ]) - }, - connect: connWithTimeout(1500) - }, 'browser-js-js': { /** * @param {Factory} factory @@ -62,47 +30,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 - /** - * @param {Factory} factory - */ - create: async (factory) => { - const relay = await createGoRelay([randomWsAddr], factory) - return Promise.all([ - createJs([randomWsAddr], factory), - relay, - createProc([], factory, relay) - ]) - }, - connect: connWithTimeout(1500) - }, - 'go-go-browser': { - skip: () => true, // FIXME when we have circuit v2 in js-ipfs and webrtc signaling - /** - * @param {Factory} factory - */ - create: async (factory) => { - const relay = await createGoRelay([randomWsAddr], factory) - return Promise.all([ - createGo([randomWsAddr], factory), - relay, - createProc([], factory) - ]) - }, - connect: connWithTimeout(1500) - }, 'js-js-browser': { /** * @param {Factory} factory @@ -114,41 +41,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 +65,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