revert: chore: update multiaddr to version 7.2.0 (#1136) (#1143)

Alan Shaw · web-flow · commit 4131d09f9734 · 2019-11-06T12:36:33.000Z
This reverts commit 9b1589c. License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>
diff --git 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": "^7.2.0",
+    "multiaddr": "^6.0.6",
     "multibase": "~0.6.0",
     "multicodec": "~0.5.1",
     "multihashes": "~0.4.14",
diff --git 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.toString()).to.be.oneOf([port, '5001', '80'])
+  expect(conf.port).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
@@ -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/p2p/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm'] }
+    const response = { Strings: ['/ip4/73.109.217.59/tcp/49311/ipfs/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/p2p/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm')
+    expect(res[0].addr.toString()).to.equal('/ip4/73.109.217.59/tcp/49311/ipfs/QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm')
     expect(res[0].peer.toB58String()).to.equal('QmWjxEGC7BthJrCf7QTModrcsRweHbupdPTY4oGMVoDZXm')
     expect(scope.isDone()).to.equal(true)
   })

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ async function clientWorks (client) {`
`134`	`134`	`function expectConfig (ipfs, { host, port, protocol, apiPath }) {`
`135`	`135`	`const conf = ipfs.getEndpointConfig()`
`136`	`136`	`expect(conf.host).to.be.oneOf([host, 'localhost', ''])`
`137`		`- expect(conf.port.toString()).to.be.oneOf([port, '5001', '80'])`
	`137`	`+ expect(conf.port).to.be.oneOf([port, '5001', 80])`
`138`	`138`	`expect(conf.protocol).to.equal(protocol \|\| 'http')`
`139`	`139`	`expect(conf['api-path']).to.equal(apiPath \|\| '/api/v0/')`
`140`	`140`	`}`