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

feat: upgrade Kubo and remove remaining Circuit V1 tests #599

Merged
merged 2 commits into from
May 3, 2023
Merged

feat: upgrade Kubo and remove remaining Circuit V1 tests #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
612ebca
chore: update Kubo
galargh Apr 5, 2023
7b1a452
fix: remove remaining Circuit v1 Go tests
hacdias May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
132 changes: 0 additions & 132 deletions test/circuit/v1/browser.js
View file
Open in desktop
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