Skip to content

Commit 7c676f6

Browse files
achingbrainachingbrain
authored
deps: update @multiformats/multiaddr to 11.0.0 (ipfs#4217)
Updates all use and dependent modules.
1 parent 79cadcf commit 7c676f6

File tree

60 files changed

+157
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+157
-151
lines changed

‎packages/interface-ipfs-core/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@libp2p/peer-id": "^1.1.10",
7474
"@libp2p/peer-id-factory": "^1.0.10",
7575
"@libp2p/websockets": "^3.0.0",
76-
"@multiformats/multiaddr": "^10.4.0",
76+
"@multiformats/multiaddr": "^11.0.0",
7777
"@types/node": "^18.0.0",
7878
"@types/pako": "^2.0.0",
7979
"@types/readable-stream": "^2.3.13",
@@ -86,10 +86,10 @@
8686
"err-code": "^3.0.1",
8787
"ipfs-core-types": "^0.12.0",
8888
"ipfs-unixfs": "^7.0.0",
89-
"ipfs-unixfs-importer": "^10.0.1",
89+
"ipfs-unixfs-importer": "^10.0.2",
9090
"ipfs-utils": "^9.0.6",
9191
"ipns": "^2.0.2",
92-
"is-ipfs": "^6.0.1",
92+
"is-ipfs": "^7.0.0",
9393
"iso-random-stream": "^2.0.2",
9494
"it-all": "^1.0.4",
9595
"it-buffer-stream": "^2.0.0",

‎packages/interface-ipfs-core/src/bootstrap/add.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import { expect } from 'aegir/chai'
44
import { getDescribe, getIt } from '../utils/mocha.js'
5-
import { Multiaddr } from '@multiformats/multiaddr'
5+
import { multiaddr, isMultiaddr } from '@multiformats/multiaddr'
66

77
const invalidArg = 'this/Is/So/Invalid/'
8-
const validIp4 = new Multiaddr('/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z')
8+
const validIp4 = multiaddr('/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z')
99

1010
/**
1111
* @typedef {import('ipfsd-ctl').Factory} Factory
@@ -59,15 +59,15 @@ export function testAdd (factory, options) {
5959
})
6060

6161
it('add a peer to the bootstrap list', async () => {
62-
const peer = new Multiaddr('/ip4/111.111.111.111/tcp/1001/p2p/QmXFX2P5ammdmXQgfqGkfswtEVFsZUJ5KeHRXQYCTdiTAb')
62+
const peer = multiaddr('/ip4/111.111.111.111/tcp/1001/p2p/QmXFX2P5ammdmXQgfqGkfswtEVFsZUJ5KeHRXQYCTdiTAb')
6363

6464
const res = await ipfs.bootstrap.add(peer)
6565
expect(res).to.be.eql({ Peers: [peer] })
6666

6767
const list = await ipfs.bootstrap.list()
6868
expect(list.Peers).to.deep.include(peer)
6969

70-
expect(list.Peers.every(ma => Multiaddr.isMultiaddr(ma))).to.be.true()
70+
expect(list.Peers.every(ma => isMultiaddr(ma))).to.be.true()
7171
})
7272
})
7373
}

‎packages/interface-ipfs-core/src/bootstrap/clear.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { expect } from 'aegir/chai'
44
import { getDescribe, getIt } from '../utils/mocha.js'
5-
import { Multiaddr } from '@multiformats/multiaddr'
5+
import { multiaddr, isMultiaddr } from '@multiformats/multiaddr'
66

77
/**
88
* @typedef {import('ipfsd-ctl').Factory} Factory
@@ -16,7 +16,7 @@ export function testClear (factory, options) {
1616
const describe = getDescribe(options)
1717
const it = getIt(options)
1818

19-
const validIp4 = new Multiaddr('/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z')
19+
const validIp4 = multiaddr('/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z')
2020

2121
describe('.bootstrap.clear', function () {
2222
this.timeout(100 * 1000)
@@ -50,7 +50,7 @@ export function testClear (factory, options) {
5050

5151
expect(removedPeers.sort()).to.deep.equal(addedPeers.sort())
5252

53-
expect(removedPeers.every(ma => Multiaddr.isMultiaddr(ma))).to.be.true()
53+
expect(removedPeers.every(ma => isMultiaddr(ma))).to.be.true()
5454
})
5555
})
5656
}

‎packages/interface-ipfs-core/src/bootstrap/list.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { expect } from 'aegir/chai'
44
import { getDescribe, getIt } from '../utils/mocha.js'
5-
import { Multiaddr } from '@multiformats/multiaddr'
5+
import { isMultiaddr } from '@multiformats/multiaddr'
66

77
/**
88
* @typedef {import('ipfsd-ctl').Factory} Factory
@@ -31,7 +31,7 @@ export function testList (factory, options) {
3131

3232
const peers = res.Peers
3333
expect(peers).to.be.an('Array')
34-
expect(peers.every(ma => Multiaddr.isMultiaddr(ma))).to.be.true()
34+
expect(peers.every(ma => isMultiaddr(ma))).to.be.true()
3535
})
3636
})
3737
}

‎packages/interface-ipfs-core/src/bootstrap/reset.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { expect } from 'aegir/chai'
44
import { getDescribe, getIt } from '../utils/mocha.js'
5-
import { Multiaddr } from '@multiformats/multiaddr'
5+
import { isMultiaddr } from '@multiformats/multiaddr'
66

77
/**
88
* @typedef {import('ipfsd-ctl').Factory} Factory
@@ -43,7 +43,7 @@ export function testReset (factory, options) {
4343
const removedPeers = rmRes.Peers
4444

4545
expect(removedPeers.sort()).to.deep.equal(addedPeers.sort())
46-
expect(addedPeers.every(ma => Multiaddr.isMultiaddr(ma))).to.be.true()
46+
expect(addedPeers.every(ma => isMultiaddr(ma))).to.be.true()
4747
})
4848
})
4949
}

‎packages/interface-ipfs-core/src/bootstrap/rm.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { expect } from 'aegir/chai'
44
import { getDescribe, getIt } from '../utils/mocha.js'
5-
import { Multiaddr } from '@multiformats/multiaddr'
5+
import { multiaddr, isMultiaddr } from '@multiformats/multiaddr'
66

77
/**
88
* @typedef {import('ipfsd-ctl').Factory} Factory
@@ -17,7 +17,7 @@ export function testRm (factory, options) {
1717
const it = getIt(options)
1818

1919
const invalidArg = 'this/Is/So/Invalid/'
20-
const validIp4 = new Multiaddr('/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z')
20+
const validIp4 = multiaddr('/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z')
2121

2222
describe('.bootstrap.rm', function () {
2323
this.timeout(100 * 1000)
@@ -47,7 +47,7 @@ export function testRm (factory, options) {
4747
})
4848

4949
it('removes a peer from the bootstrap list', async () => {
50-
const peer = new Multiaddr('/ip4/111.111.111.111/tcp/1001/p2p/QmXFX2P5ammdmXQgfqGkfswtEVFsZUJ5KeHRXQYCTdiTAb')
50+
const peer = multiaddr('/ip4/111.111.111.111/tcp/1001/p2p/QmXFX2P5ammdmXQgfqGkfswtEVFsZUJ5KeHRXQYCTdiTAb')
5151
await ipfs.bootstrap.add(peer)
5252
let list = await ipfs.bootstrap.list()
5353
expect(list.Peers).to.deep.include(peer)
@@ -57,7 +57,7 @@ export function testRm (factory, options) {
5757

5858
list = await ipfs.bootstrap.list()
5959
expect(list.Peers).to.not.deep.include(peer)
60-
expect(res.Peers.every(ma => Multiaddr.isMultiaddr(ma))).to.be.true()
60+
expect(res.Peers.every(ma => isMultiaddr(ma))).to.be.true()
6161
})
6262
})
6363
}

‎packages/interface-ipfs-core/src/miscellaneous/id.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { expect } from 'aegir/chai'
44
import { getDescribe, getIt } from '../utils/mocha.js'
5-
import { Multiaddr } from '@multiformats/multiaddr'
5+
import { isMultiaddr } from '@multiformats/multiaddr'
66
import { isWebWorker } from 'ipfs-utils/src/env.js'
77
import retry from 'p-retry'
88

@@ -38,7 +38,7 @@ export function testId (factory, options) {
3838
expect(res).to.have.a.property('addresses').that.is.an('array')
3939

4040
for (const ma of res.addresses) {
41-
expect(Multiaddr.isMultiaddr(ma)).to.be.true()
41+
expect(isMultiaddr(ma)).to.be.true()
4242
}
4343
})
4444

‎packages/interface-ipfs-core/src/miscellaneous/resolve.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22

33
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
4-
import isIpfs from 'is-ipfs'
4+
import * as isIpfs from 'is-ipfs'
55
import { nanoid } from 'nanoid'
66
import { base64url } from 'multiformats/bases/base64'
77
import { expect } from 'aegir/chai'

‎packages/interface-ipfs-core/src/swarm/addrs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-env mocha */
22

3-
import { Multiaddr } from '@multiformats/multiaddr'
3+
import { isMultiaddr } from '@multiformats/multiaddr'
44
import { expect } from 'aegir/chai'
55
import { getDescribe, getIt } from '../utils/mocha.js'
66
import { isWebWorker } from 'ipfs-utils/src/env.js'
@@ -47,7 +47,7 @@ export function testAddrs (factory, options) {
4747
expect(peer).to.have.a.property('addrs').that.is.an('array')
4848

4949
for (const ma of peer.addrs) {
50-
expect(Multiaddr.isMultiaddr(ma)).to.be.true()
50+
expect(isMultiaddr(ma)).to.be.true()
5151
}
5252
}
5353
})

‎packages/interface-ipfs-core/src/swarm/peers.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-env mocha */
22

3-
import { Multiaddr } from '@multiformats/multiaddr'
3+
import { isMultiaddr } from '@multiformats/multiaddr'
44
import delay from 'delay'
55
import { isBrowser, isWebWorker } from 'ipfs-utils/src/env.js'
66
import { expect } from 'aegir/chai'
@@ -60,7 +60,7 @@ export function testPeers (factory, options) {
6060
const peer = peers[0]
6161

6262
expect(peer).to.have.a.property('addr')
63-
expect(Multiaddr.isMultiaddr(peer.addr)).to.equal(true)
63+
expect(isMultiaddr(peer.addr)).to.equal(true)
6464
expect(peer).to.have.a.property('peer')
6565
expect(peer.peer).to.be.ok()
6666
expect(peer).to.not.have.a.property('latency')
@@ -77,7 +77,7 @@ export function testPeers (factory, options) {
7777

7878
const peer = peers[0]
7979
expect(peer).to.have.a.property('addr')
80-
expect(Multiaddr.isMultiaddr(peer.addr)).to.equal(true)
80+
expect(isMultiaddr(peer.addr)).to.equal(true)
8181
expect(peer).to.have.a.property('peer')
8282
expect(peer).to.have.a.property('latency')
8383
expect(peer.latency).to.match(/n\/a|[0-9]+[mµ]?s/) // n/a or 3ms or 3µs or 3s

‎packages/ipfs-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@libp2p/logger": "^2.0.0",
7474
"@libp2p/peer-id": "^1.1.10",
7575
"@multiformats/mafmt": "^11.0.2",
76-
"@multiformats/multiaddr": "^10.4.0",
76+
"@multiformats/multiaddr": "^11.0.0",
7777
"@multiformats/multiaddr-to-uri": "^9.0.1",
7878
"byteman": "^1.3.5",
7979
"execa": "^6.1.0",
@@ -107,7 +107,7 @@
107107
"@types/rimraf": "^3.0.1",
108108
"@types/yargs": "^17.0.10",
109109
"aegir": "^37.0.11",
110-
"ipfs-repo": "^15.0.0",
110+
"ipfs-repo": "^15.0.3",
111111
"it-all": "^1.0.4",
112112
"it-first": "^1.0.4",
113113
"it-to-buffer": "^2.0.0",

‎packages/ipfs-cli/src/commands/swarm/peers.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { IPFS } from '@multiformats/mafmt'
2-
import { Multiaddr } from '@multiformats/multiaddr'
2+
import { multiaddr } from '@multiformats/multiaddr'
33
import parseDuration from 'parse-duration'
44

55
/**
@@ -31,7 +31,7 @@ const command = {
3131
})
3232

3333
result.forEach((item) => {
34-
let ma = new Multiaddr(`${item.addr}`)
34+
let ma = multiaddr(`${item.addr}`)
3535

3636
if (!IPFS.matches(ma)) {
3737
ma = ma.encapsulate(`/ipfs/${item.peer}`)

‎packages/ipfs-cli/src/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Progress from 'progress'
77
import byteman from 'byteman'
88
import { create } from 'ipfs-core'
99
import { CID } from 'multiformats/cid'
10-
import { Multiaddr } from '@multiformats/multiaddr'
10+
import { multiaddr } from '@multiformats/multiaddr'
1111
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
1212
import { create as httpClient } from 'ipfs-http-client'
1313
import { peerIdFromString } from '@libp2p/peer-id'
@@ -267,7 +267,7 @@ export const coerceMultiaddr = (value) => {
267267
return undefined
268268
}
269269

270-
return new Multiaddr(value)
270+
return multiaddr(value)
271271
}
272272

273273
/**

‎packages/ipfs-cli/test/bootstrap.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import { expect } from 'aegir/chai'
44
import { cli } from './utils/cli.js'
55
import sinon from 'sinon'
6-
import { Multiaddr } from '@multiformats/multiaddr'
6+
import { multiaddr } from '@multiformats/multiaddr'
77

88
describe('bootstrap', () => {
9-
const peer = new Multiaddr('/ip4/111.111.111.111/tcp/1001/p2p/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD')
9+
const peer = multiaddr('/ip4/111.111.111.111/tcp/1001/p2p/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD')
1010
let ipfs
1111

1212
before(() => {

‎packages/ipfs-cli/test/swarm.spec.js

+23-23
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { expect } from 'aegir/chai'
55
import { cli, fail } from './utils/cli.js'
66
import sinon from 'sinon'
7-
import { Multiaddr } from '@multiformats/multiaddr'
7+
import { multiaddr } from '@multiformats/multiaddr'
88
import { peerIdFromString } from '@libp2p/peer-id'
99

1010
describe('swarm', () => {
@@ -28,33 +28,33 @@ describe('swarm', () => {
2828
}
2929

3030
it('connect online', async () => {
31-
const multiaddr = new Multiaddr('/ip4/123.123.123.123/tcp/482')
31+
const ma = multiaddr('/ip4/123.123.123.123/tcp/482')
3232

33-
ipfs.swarm.connect.withArgs(multiaddr, defaultOptions).resolves()
33+
ipfs.swarm.connect.withArgs(ma, defaultOptions).resolves()
3434

35-
const out = await cli(`swarm connect ${multiaddr}`, { ipfs, isDaemon: true })
36-
expect(out).to.equal(`${multiaddr}\n`)
35+
const out = await cli(`swarm connect ${ma}`, { ipfs, isDaemon: true })
36+
expect(out).to.equal(`${ma}\n`)
3737
})
3838

3939
it('connect offline', async () => {
40-
const multiaddr = new Multiaddr('/ip4/123.123.123.123/tcp/482')
40+
const ma = multiaddr('/ip4/123.123.123.123/tcp/482')
4141

42-
const out = await fail(`swarm connect ${multiaddr}`, { ipfs, isDaemon: false })
42+
const out = await fail(`swarm connect ${ma}`, { ipfs, isDaemon: false })
4343
expect(out).to.include('This command must be run in online mode')
4444

4545
expect(ipfs.swarm.connect.called).to.be.false()
4646
})
4747

4848
it('connect with timeout', async () => {
49-
const multiaddr = new Multiaddr('/ip4/123.123.123.123/tcp/482')
49+
const ma = multiaddr('/ip4/123.123.123.123/tcp/482')
5050

51-
ipfs.swarm.connect.withArgs(multiaddr, {
51+
ipfs.swarm.connect.withArgs(ma, {
5252
...defaultOptions,
5353
timeout: 1000
5454
}).resolves()
5555

56-
const out = await cli(`swarm connect ${multiaddr} --timeout=1s`, { ipfs, isDaemon: true })
57-
expect(out).to.equal(`${multiaddr}\n`)
56+
const out = await cli(`swarm connect ${ma} --timeout=1s`, { ipfs, isDaemon: true })
57+
expect(out).to.equal(`${ma}\n`)
5858
})
5959
})
6060

@@ -110,7 +110,7 @@ describe('swarm', () => {
110110
ipfs.swarm.addrs.withArgs(defaultOptions).resolves([{
111111
id: peer,
112112
addrs: [
113-
new Multiaddr(addr)
113+
multiaddr(addr)
114114
]
115115
}])
116116

@@ -128,7 +128,7 @@ describe('swarm', () => {
128128
}).resolves([{
129129
id: peer,
130130
addrs: [
131-
new Multiaddr(addr)
131+
multiaddr(addr)
132132
]
133133
}])
134134

@@ -175,26 +175,26 @@ describe('swarm', () => {
175175
}
176176

177177
it('disconnect online', async () => {
178-
const multiaddr = new Multiaddr('/ip4/123.123.123.123/tcp/482')
179-
ipfs.swarm.disconnect.withArgs(multiaddr, defaultOptions).resolves()
180-
const out = await cli(`swarm disconnect ${multiaddr}`, { ipfs, isDaemon: true })
181-
expect(out).to.equal(`${multiaddr}\n`)
178+
const ma = multiaddr('/ip4/123.123.123.123/tcp/482')
179+
ipfs.swarm.disconnect.withArgs(ma, defaultOptions).resolves()
180+
const out = await cli(`swarm disconnect ${ma}`, { ipfs, isDaemon: true })
181+
expect(out).to.equal(`${ma}\n`)
182182
})
183183

184184
it('disconnect offline', async () => {
185-
const multiaddr = new Multiaddr('/ip4/123.123.123.123/tcp/482')
186-
const out = await fail(`swarm disconnect ${multiaddr}`, { ipfs, isDaemon: false })
185+
const ma = multiaddr('/ip4/123.123.123.123/tcp/482')
186+
const out = await fail(`swarm disconnect ${ma}`, { ipfs, isDaemon: false })
187187
expect(out).to.include('This command must be run in online mode')
188188
})
189189

190190
it('disconnect with timeout', async () => {
191-
const multiaddr = new Multiaddr('/ip4/123.123.123.123/tcp/482')
192-
ipfs.swarm.disconnect.withArgs(multiaddr, {
191+
const ma = multiaddr('/ip4/123.123.123.123/tcp/482')
192+
ipfs.swarm.disconnect.withArgs(ma, {
193193
...defaultOptions,
194194
timeout: 1000
195195
}).resolves()
196-
const out = await cli(`swarm disconnect ${multiaddr} --timeout=1s`, { ipfs, isDaemon: true })
197-
expect(out).to.equal(`${multiaddr}\n`)
196+
const out = await cli(`swarm disconnect ${ma} --timeout=1s`, { ipfs, isDaemon: true })
197+
expect(out).to.equal(`${ma}\n`)
198198
})
199199
})
200200
})

0 commit comments

Comments
 (0)