bump dependencies

.aegir.js

@@ -12,7 +12,7 @@ let listener
 
 async function before () {
   const ws = new WS({ upgrader: mockUpgrader })
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
   listener = ws.createListener(conn => pipe(conn, conn))
   await listener.listen(ma)
   listener.on('error', console.error)

package.json

@@ -46,8 +46,8 @@
     "it-ws": "^4.0.0",
     "libp2p-utils": "^0.2.1",
     "mafmt": "^8.0.1",
-    "multiaddr": "^8.1.1",
+    "multiaddr": "^9.0.1",
-    "multiaddr-to-uri": "^6.0.0",
+    "multiaddr-to-uri": "fluencelabs/js-multiaddr-to-uri",
     "p-defer": "^3.0.0",
     "p-timeout": "^4.1.0"
   },

src/listener.js

@@ -78,7 +78,7 @@ module.exports = ({ handler, upgrader }, options = {}) => {
         Object.keys(netInterfaces).forEach((niKey) => {
           netInterfaces[niKey].forEach((ni) => {
             if (ni.family === 'IPv4') {
-              multiaddrs.push(multiaddr(m.toString().replace('0.0.0.0', ni.address)))
+              multiaddrs.push(new multiaddr.Multiaddr(m.toString().replace('0.0.0.0', ni.address)))
             }
           })
         })

test/browser.js

@@ -17,7 +17,7 @@ const mockUpgrader = {
 }
 
 describe('libp2p-websockets', () => {
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
   let ws
   let conn
 

test/compliance.node.js

@@ -12,10 +12,10 @@ describe('interface-transport compliance', () => {
     async setup ({ upgrader }) { // eslint-disable-line require-await
       const ws = new WS({ upgrader, filter: filters.all })
       const addrs = [
-        multiaddr('/ip4/127.0.0.1/tcp/9091/ws'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/ws'),
-        multiaddr('/ip4/127.0.0.1/tcp/9092/ws'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9092/ws'),
-        multiaddr('/dns4/ipfs.io/tcp/9092/ws'),
+        new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/9092/ws'),
-        multiaddr('/dns4/ipfs.io/tcp/9092/wss')
+        new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/9092/wss')
       ]
 
       let delayMs = 0

test/node.js

@@ -35,7 +35,7 @@ describe('instantiate the transport', () => {
 describe('listen', () => {
   describe('ip4', () => {
     let ws
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -70,7 +70,7 @@ describe('listen', () => {
     })
 
     it('listen on addr with /ipfs/QmHASH', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -78,7 +78,7 @@ describe('listen', () => {
     })
 
     it('listen on port 0', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -88,7 +88,7 @@ describe('listen', () => {
     })
 
     it('listen on any Interface', async () => {
-      const ma = multiaddr('/ip4/0.0.0.0/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -107,7 +107,7 @@ describe('listen', () => {
     })
 
     it('getAddrs on port 0 listen', async () => {
-      const addr = multiaddr('/ip4/127.0.0.1/tcp/0/ws')
+      const addr = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws')
       const listener = ws.createListener((conn) => { })
       await listener.listen(addr)
       const addrs = await listener.getAddrs()
@@ -117,7 +117,7 @@ describe('listen', () => {
     })
 
     it('getAddrs from listening on 0.0.0.0', async () => {
-      const addr = multiaddr('/ip4/0.0.0.0/tcp/9003/ws')
+      const addr = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/9003/ws')
       const listener = ws.createListener((conn) => { })
       await listener.listen(addr)
       const addrs = await listener.getAddrs()
@@ -126,7 +126,7 @@ describe('listen', () => {
     })
 
     it('getAddrs from listening on 0.0.0.0 and port 0', async () => {
-      const addr = multiaddr('/ip4/0.0.0.0/tcp/0/ws')
+      const addr = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0/ws')
       const listener = ws.createListener((conn) => { })
       await listener.listen(addr)
       const addrs = await listener.getAddrs()
@@ -136,7 +136,7 @@ describe('listen', () => {
     })
 
     it('getAddrs preserves p2p Id', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -149,7 +149,7 @@ describe('listen', () => {
 
   describe('ip6', () => {
     let ws
-    const ma = multiaddr('/ip6/::1/tcp/9091/ws')
+    const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -184,7 +184,7 @@ describe('listen', () => {
     })
 
     it('listen on addr with /ipfs/QmHASH', async () => {
-      const ma = multiaddr('/ip6/::1/tcp/9091/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
       await listener.listen(ma)
       await listener.close()
@@ -196,7 +196,7 @@ describe('dial', () => {
   describe('ip4', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9091/ws')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -216,7 +216,7 @@ describe('dial', () => {
     })
 
     it('dial with p2p Id', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const conn = await ws.dial(ma)
       const s = goodbye({ source: ['hey'], sink: collect })
 
@@ -226,7 +226,7 @@ describe('dial', () => {
     })
 
     it('dial should throw on immediate abort', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/0/ws')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws')
       const controller = new AbortController()
 
       const conn = ws.dial(ma, { signal: controller.signal })
@@ -236,7 +236,7 @@ describe('dial', () => {
     })
 
     it('should resolve port 0', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/0/ws')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws')
       const ws = new WS({ upgrader: mockUpgrader })
 
       // Create a Promise that resolves when a connection is handled
@@ -266,7 +266,7 @@ describe('dial', () => {
   describe('ip4 no loopback', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip4/0.0.0.0/tcp/0/ws')
+    const ma = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -296,7 +296,7 @@ describe('dial', () => {
   describe('ip4 with wss', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9091/wss')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/wss')
 
     const server = https.createServer({
       cert: fs.readFileSync('./test/fixtures/certificate.pem'),
@@ -324,7 +324,7 @@ describe('dial', () => {
   describe('ip6', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip6/::1/tcp/9091')
+    const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -353,7 +353,7 @@ describe('dial', () => {
     })
 
     it('dial with p2p Id', async () => {
-      const ma = multiaddr('/ip6/::1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const conn = await ws.dial(ma)
 
       const s = goodbye({
@@ -376,19 +376,19 @@ describe('filter addrs', () => {
     })
 
     it('should filter out invalid WS addresses', function () {
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
-      const ma2 = multiaddr('/ip4/127.0.0.1/udp/9090')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/udp/9090')
-      const ma3 = multiaddr('/ip6/::1/tcp/80')
+      const ma3 = new multiaddr.Multiaddr('/ip6/::1/tcp/80')
-      const ma4 = multiaddr('/dnsaddr/ipfs.io/tcp/80')
+      const ma4 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80')
 
       const valid = ws.filter([ma1, ma2, ma3, ma4])
       expect(valid.length).to.equal(0)
     })
 
     it('should filter correct dns address', function () {
-      const ma1 = multiaddr('/dnsaddr/ipfs.io/ws')
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/ws')
-      const ma2 = multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
-      const ma3 = multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
+      const ma3 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
 
       const valid = ws.filter([ma1, ma2, ma3])
       expect(valid.length).to.equal(3)
@@ -398,8 +398,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns address with ipfs id', function () {
-      const ma1 = multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -408,8 +408,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns4 address', function () {
-      const ma1 = multiaddr('/dns4/ipfs.io/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/80/ws')
-      const ma2 = multiaddr('/dns4/ipfs.io/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -418,8 +418,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns6 address', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws')
-      const ma2 = multiaddr('/dns6/ipfs.io/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -428,8 +428,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns6 address with ipfs id', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -444,18 +444,18 @@ describe('filter addrs', () => {
     })
 
     it('should fail invalid WS addresses', function () {
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
-      const ma2 = multiaddr('/ip4/127.0.0.1/udp/9090')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/udp/9090')
-      const ma3 = multiaddr('/ip6/::1/tcp/80')
+      const ma3 = new multiaddr.Multiaddr('/ip6/::1/tcp/80')
-      const ma4 = multiaddr('/dnsaddr/ipfs.io/tcp/80')
+      const ma4 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80')
 
       const valid = ws.filter([ma1, ma2, ma3, ma4])
       expect(valid.length).to.equal(0)
     })
 
     it('should filter correct ipv4 addresses', function () {
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/80/ws')
-      const ma2 = multiaddr('/ip4/127.0.0.1/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -464,8 +464,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct ipv4 addresses with ipfs id', function () {
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/ip4/127.0.0.1/tcp/80/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/80/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -474,8 +474,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct ipv6 address', function () {
-      const ma1 = multiaddr('/ip6/::1/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/ip6/::1/tcp/80/ws')
-      const ma2 = multiaddr('/ip6/::1/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/ip6/::1/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -484,8 +484,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct ipv6 addresses with ipfs id', function () {
-      const ma1 = multiaddr('/ip6/::1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/ip6/::1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/ip6/::1/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/ip6/::1/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -494,9 +494,9 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns address', function () {
-      const ma1 = multiaddr('/dnsaddr/ipfs.io/ws')
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/ws')
-      const ma2 = multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
-      const ma3 = multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
+      const ma3 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
 
       const valid = ws.filter([ma1, ma2, ma3])
       expect(valid.length).to.equal(3)
@@ -506,8 +506,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns address with ipfs id', function () {
-      const ma1 = multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -516,8 +516,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns4 address', function () {
-      const ma1 = multiaddr('/dns4/ipfs.io/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/80/ws')
-      const ma2 = multiaddr('/dns4/ipfs.io/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -526,8 +526,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns6 address', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws')
-      const ma2 = multiaddr('/dns6/ipfs.io/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -536,8 +536,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns6 address with ipfs id', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -546,11 +546,11 @@ describe('filter addrs', () => {
     })
 
     it('should filter mixed addresses', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/ip4/127.0.0.1/tcp/9090')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
-      const ma3 = multiaddr('/ip4/127.0.0.1/udp/9090')
+      const ma3 = new multiaddr.Multiaddr('/ip4/127.0.0.1/udp/9090')
-      const ma4 = multiaddr('/dns6/ipfs.io/ws')
+      const ma4 = new multiaddr.Multiaddr('/dns6/ipfs.io/ws')
-      const mh5 = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw' +
+      const mh5 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw' +
         '/p2p-circuit/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2, ma3, ma4, mh5])
@@ -560,7 +560,7 @@ describe('filter addrs', () => {
     })
 
     it('filter a single addr for this transport', () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter(ma)
       expect(valid.length).to.equal(1)