From d224d155073b9f65cdb0385da02e81347108dfb3 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Thu, 8 Apr 2021 17:28:49 +0200 Subject: [PATCH] chore: update multiaddr to 9 --- package.json | 10 +++++----- src/connection/connection.js | 10 +++++----- src/peer-discovery/tests/index.js | 4 ++-- src/pubsub/peer-streams.js | 1 + src/stream-muxer/tests/close-test.js | 4 ++-- test/connection/compliance.spec.js | 6 +++--- test/peer-discovery/mock-discovery.js | 4 ++-- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index ab46d0a..74cb699 100644 --- a/package.json +++ b/package.json @@ -64,14 +64,14 @@ "detect-node": "^2.0.4", "dirty-chai": "^2.0.1", "err-code": "^3.0.1", - "it-goodbye": "^2.0.2", - "it-length-prefixed": "^3.1.0", + "it-goodbye": "^3.0.0", + "it-length-prefixed": "^5.0.0", "it-pair": "^1.0.0", "it-pipe": "^1.1.0", "it-pushable": "^1.4.2", "libp2p-crypto": "^0.19.0", - "libp2p-tcp": "^0.15.0", - "multiaddr": "^8.1.2", + "libp2p-tcp": "^0.15.3", + "multiaddr": "^9.0.1", "multibase": "^4.0.2", "multihashes": "^4.0.2", "p-defer": "^3.0.0", @@ -85,7 +85,7 @@ }, "devDependencies": { "@types/debug": "^4.1.5", - "aegir": "^32.1.0", + "aegir": "^33.0.0", "cids": "^1.1.6", "events": "^3.3.0", "it-handshake": "^1.0.2", diff --git a/src/connection/connection.js b/src/connection/connection.js index afe06c8..168ff11 100644 --- a/src/connection/connection.js +++ b/src/connection/connection.js @@ -1,7 +1,7 @@ 'use strict' const PeerId = require('peer-id') -const multiaddr = require('multiaddr') +const { Multiaddr } = require('multiaddr') const errCode = require('err-code') const { OPEN, CLOSING, CLOSED } = require('./status') @@ -25,8 +25,8 @@ const connectionSymbol = Symbol.for('@libp2p/interface-connection/connection') * @property {string} [encryption] - connection encryption method identifier. * * @typedef {Object} ConnectionOptions - * @property {multiaddr} [localAddr] - local multiaddr of the connection if known. - * @property {multiaddr} remoteAddr - remote multiaddr of the connection. + * @property {Multiaddr} [localAddr] - local multiaddr of the connection if known. + * @property {Multiaddr} remoteAddr - remote multiaddr of the connection. * @property {PeerId} localPeer - local peer-id. * @property {PeerId} remotePeer - remote peer-id. * @property {(protocols: string|string[]) => Promise<{stream: MuxedStream, protocol: string}>} newStream - new stream muxer function. @@ -231,7 +231,7 @@ class Connection { module.exports = Connection /** - * @param {multiaddr|undefined} localAddr + * @param {Multiaddr|undefined} localAddr * @param {PeerId} localPeer * @param {PeerId} remotePeer * @param {(protocols: string | string[]) => Promise<{ stream: import("../stream-muxer/types").MuxedStream; protocol: string; }>} newStream @@ -240,7 +240,7 @@ module.exports = Connection * @param {{ direction: any; timeline: any; multiplexer?: string | undefined; encryption?: string | undefined; }} stat */ function validateArgs (localAddr, localPeer, remotePeer, newStream, close, getStreams, stat) { - if (localAddr && !multiaddr.isMultiaddr(localAddr)) { + if (localAddr && !Multiaddr.isMultiaddr(localAddr)) { throw errCode(new Error('localAddr must be an instance of multiaddr'), 'ERR_INVALID_PARAMETERS') } diff --git a/src/peer-discovery/tests/index.js b/src/peer-discovery/tests/index.js index 7283899..0dffc5f 100644 --- a/src/peer-discovery/tests/index.js +++ b/src/peer-discovery/tests/index.js @@ -6,7 +6,7 @@ const chai = require('chai') const expect = chai.expect chai.use(require('dirty-chai')) -const multiaddr = require('multiaddr') +const { Multiaddr } = require('multiaddr') const PeerId = require('peer-id') const delay = require('delay') @@ -55,7 +55,7 @@ module.exports = (common) => { expect(PeerId.isPeerId(id)).to.eql(true) expect(multiaddrs).to.exist() - multiaddrs.forEach((m) => expect(multiaddr.isMultiaddr(m)).to.eql(true)) + multiaddrs.forEach((m) => expect(Multiaddr.isMultiaddr(m)).to.eql(true)) defer.resolve() }) diff --git a/src/pubsub/peer-streams.js b/src/pubsub/peer-streams.js index 5a5886e..e10fa4f 100644 --- a/src/pubsub/peer-streams.js +++ b/src/pubsub/peer-streams.js @@ -9,6 +9,7 @@ const log = Object.assign(debug('libp2p-pubsub:peer-streams'), { /** @type Events */ const EventEmitter = require('events') +// @ts-ignore TODO: https://github.com/alanshaw/it-length-prefixed/pull/15 const lp = require('it-length-prefixed') const pushable = require('it-pushable') diff --git a/src/stream-muxer/tests/close-test.js b/src/stream-muxer/tests/close-test.js index e70dc56..480ca80 100644 --- a/src/stream-muxer/tests/close-test.js +++ b/src/stream-muxer/tests/close-test.js @@ -7,12 +7,12 @@ const pair = require('it-pair/duplex') const { pipe } = require('it-pipe') const { consume } = require('streaming-iterables') const Tcp = require('libp2p-tcp') -const multiaddr = require('multiaddr') +const { Multiaddr } = require('multiaddr') const { source: abortable } = require('abortable-iterator') const AbortController = require('abort-controller').default const uint8arrayFromString = require('uint8arrays/from-string') -const mh = multiaddr('/ip4/127.0.0.1/tcp/0') +const mh = new Multiaddr('/ip4/127.0.0.1/tcp/0') function pause (ms) { return new Promise(resolve => setTimeout(resolve, ms)) diff --git a/test/connection/compliance.spec.js b/test/connection/compliance.spec.js index e163b87..350b4fe 100644 --- a/test/connection/compliance.spec.js +++ b/test/connection/compliance.spec.js @@ -5,7 +5,7 @@ const tests = require('../../src/connection/tests') const { Connection } = require('../../src/connection') const peers = require('../../src/utils/peers') const PeerId = require('peer-id') -const multiaddr = require('multiaddr') +const { Multiaddr } = require('multiaddr') const pair = require('it-pair') describe('compliance tests', () => { @@ -17,8 +17,8 @@ describe('compliance tests', () => { * @param {*} properties */ async setup (properties) { - const localAddr = multiaddr('/ip4/127.0.0.1/tcp/8080') - const remoteAddr = multiaddr('/ip4/127.0.0.1/tcp/8081') + const localAddr = new Multiaddr('/ip4/127.0.0.1/tcp/8080') + const remoteAddr = new Multiaddr('/ip4/127.0.0.1/tcp/8081') const [localPeer, remotePeer] = await Promise.all([ PeerId.createFromJSON(peers[0]), PeerId.createFromJSON(peers[1]) diff --git a/test/peer-discovery/mock-discovery.js b/test/peer-discovery/mock-discovery.js index a9f0ca2..12d8d3c 100644 --- a/test/peer-discovery/mock-discovery.js +++ b/test/peer-discovery/mock-discovery.js @@ -2,7 +2,7 @@ const { EventEmitter } = require('events') -const multiaddr = require('multiaddr') +const { Multiaddr } = require('multiaddr') const PeerId = require('peer-id') /** @@ -41,7 +41,7 @@ class MockDiscovery extends EventEmitter { this._timer = setTimeout(() => { this.emit('peer', { id: peerId, - multiaddrs: [multiaddr('/ip4/127.0.0.1/tcp/8000')] + multiaddrs: [new Multiaddr('/ip4/127.0.0.1/tcp/8000')] }) }, this.options.discoveryDelay || 1000) }