Skip to content
This repository has been archived by the owner on Aug 1, 2023. It is now read-only.

Commit

Permalink
fix: remove remaining Circuit v1 Go tests
Browse files Browse the repository at this point in the history
  • Loading branch information
hacdias committed May 3, 2023
1 parent 612ebca commit 7b1a452
Showing 1 changed file with 0 additions and 132 deletions.
132 changes: 0 additions & 132 deletions test/circuit/v1/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import delay from 'delay'
import { isWebWorker } from 'wherearewe'
import {
createJs,
createGo,
createGoRelay,
createProc,
connWithTimeout,
randomWsAddr,
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7b1a452

Please sign in to comment.