From 29010e33805ba219f928104ba622b2fbd142b477 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 12:59:56 +0000 Subject: [PATCH 1/2] fix(package): update multiaddr to version 7.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b7a24ba9..a45e2e32e 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "ky-universal": "^0.3.0", "lru-cache": "^5.1.1", "merge-options": "^2.0.0", - "multiaddr": "^6.0.6", + "multiaddr": "^7.2.0", "multibase": "~0.6.0", "multicodec": "~0.5.1", "multihashes": "~0.4.14", From bc36c8e7f29ba195b6ebcea662b2cc53f8a8d0cc Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Tue, 5 Nov 2019 11:55:40 +0000 Subject: [PATCH 2/2] fix: tests --- test/constructor.spec.js | 2 +- test/node/swarm.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/constructor.spec.js b/test/constructor.spec.js index e4a7eb1aa..c728c94c1 100644 --- a/test/constructor.spec.js +++ b/test/constructor.spec.js @@ -134,7 +134,7 @@ async function clientWorks (client) { function expectConfig (ipfs, { host, port, protocol, apiPath }) { const conf = ipfs.getEndpointConfig() expect(conf.host).to.be.oneOf([host, 'localhost', '']) - expect(conf.port).to.be.oneOf([port, '5001', 80]) + expect(conf.port.toString()).to.be.oneOf([port, '5001', '80']) expect(conf.protocol).to.equal(protocol || 'http') expect(conf['api-path']).to.equal(apiPath || '/api/v0/') } diff --git a/test/node/swarm.js b/test/node/swarm.js index 27d377904..b54690dc0 100644 --- a/test/node/swarm.js +++ b/test/node/swarm.js @@ -30,7 +30,7 @@ describe('.swarm.peers', function () { }) it('handles a go-ipfs <= 0.4.4 peer response', async () => { - const response = { Strings: ['/ip4/73.109.217.59/tcp/49311/ipfs/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm'] } + const response = { Strings: ['/ip4/73.109.217.59/tcp/49311/p2p/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm'] } const scope = nock(apiUrl) .post('/api/v0/swarm/peers') @@ -42,7 +42,7 @@ describe('.swarm.peers', function () { expect(res).to.be.a('array') expect(res.length).to.equal(1) expect(res[0].error).to.not.exist() - expect(res[0].addr.toString()).to.equal('/ip4/73.109.217.59/tcp/49311/ipfs/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm') + expect(res[0].addr.toString()).to.equal('/ip4/73.109.217.59/tcp/49311/p2p/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm') expect(res[0].peer.toB58String()).to.equal('QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm') expect(scope.isDone()).to.equal(true) })