chore: update to new multiformats

package.json

@@ -33,31 +33,28 @@
     "go-ipfs": false
   },
   "dependencies": {
-    "aegir": "^33.2.1",
+    "aegir": "^34.0.2",
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
     "cross-env": "^7.0.2",
     "delay": "^5.0.0",
     "detect-node": "^2.0.4",
-    "dirty-chai": "^2.0.1",
-    "ipfs-unixfs": "^4.0.1",
-    "ipfsd-ctl": "^8.0.0",
-    "ipns": "^0.12.0",
+    "ipfs-unixfs": "^5.0.0",
+    "ipfsd-ctl": "^9.0.0",
+    "ipns": "^0.13.2",
     "is-ci": "^3.0.0",
     "is-os": "^1.0.1",
     "iso-random-stream": "^2.0.0",
     "it-all": "^1.0.1",
     "it-concat": "^2.0.0",
     "it-drain": "^1.0.0",
     "it-last": "^1.0.1",
-    "libp2p-webrtc-star": "^0.22.4",
-    "libp2p-websockets": "^0.15.9",
-    "multihashes": "^4.0.2",
+    "libp2p-webrtc-star": "^0.23.0",
+    "libp2p-websockets": "^0.16.1",
+    "multiformats": "^9.3.0",
     "nanoid": "^3.1.10",
     "p-retry": "^4.1.0",
-    "peer-id": "^0.14.0",
+    "peer-id": "^0.15.1",
     "pretty-bytes": "^5.1.0",
     "promisify-es6": "^1.0.3",
     "random-fs": "^1.0.3",

test/cid-version-agnostic.js

@@ -3,7 +3,7 @@
 
 const { nanoid } = require('nanoid')
 const concat = require('it-concat')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 

test/exchange-files.js

@@ -15,7 +15,7 @@ const os = require('os')
 const rmDir = promisify(rimraf)
 const concat = require('it-concat')
 const { globSource } = require(process.env.IPFS_JS_MODULE || 'ipfs')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 
 function tmpDir () {

test/files.js

@@ -8,7 +8,7 @@ const bufferStream = require('readable-stream-buffer-stream')
 const concat = require('it-concat')
 const all = require('it-all')
 const last = require('it-last')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 
 const SHARD_THRESHOLD = 1000
 

test/ipns-pubsub.js

@@ -2,12 +2,12 @@
 'use strict'
 
 const PeerID = require('peer-id')
-const { fromB58String } = require('multihashes')
+const { base58btc } = require('multiformats/bases/base58')
 const ipns = require('ipns')
 const last = require('it-last')
 const pRetry = require('p-retry')
 const waitFor = require('./utils/wait-for')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 const uint8ArrayToString = require('uint8arrays/to-string')
 
@@ -101,7 +101,7 @@ const subscribeToReceiveByPubsub = async (nodeA, nodeB, idA, idB) => {
     subscribed = true
   }
 
-  const keys = ipns.getIdKeys(fromB58String(idA))
+  const keys = ipns.getIdKeys(base58btc.decode(`z${idA}`))
   const topic = `${namespace}${uint8ArrayToString(keys.routingKey.uint8Array(), 'base64url')}`
 
   await waitForPeerToSubscribe(nodeB.api, topic)
@@ -111,7 +111,7 @@ const subscribeToReceiveByPubsub = async (nodeA, nodeB, idA, idB) => {
   await waitFor(() => subscribed === true, (50 * 1000))
   const res2 = await last(nodeB.api.name.resolve(idA))
 
-  expect(PeerID.createFromCID(res1.name).toString()).to.equal(PeerID.createFromCID(idA).toString()) // Published to Node A ID
+  expect(PeerID.parse(res1.name).toString()).to.equal(PeerID.parse(idA).toString()) // Published to Node A ID
   expect(res2).to.equal(ipfsRef)
 }
 
@@ -130,7 +130,7 @@ const waitForPeerToSubscribe = async (daemon, topic) => {
     const res = await daemon.pubsub.ls()
 
     if (!res || !res.length || !res.includes(topic)) {
-      throw new Error('Could not find subscription')
+      throw new Error(`Could not find subscription to ${topic} in "${JSON.stringify(res)}"`)
     }
 
     return res[0]

test/ipns.js

@@ -6,7 +6,7 @@ const path = require('path')
 const { nanoid } = require('nanoid')
 const delay = require('delay')
 const last = require('it-last')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 
 const dir = path.join(os.tmpdir(), nanoid())

test/kad-dht.js

@@ -3,7 +3,7 @@
 
 const randomBytes = require('iso-random-stream/src/random')
 const concat = require('it-concat')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 
 describe.skip('kad-dht', () => {

test/pin.js

@@ -4,7 +4,7 @@
 const fs = require('fs')
 const all = require('it-all')
 const utils = require('./utils/pin-utils')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 

test/pubsub.js

@@ -3,7 +3,7 @@
 'use strict'
 
 const pRetry = require('p-retry')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 const uint8ArrayEquals = require('uint8arrays/equals')

test/repo.js

@@ -7,7 +7,7 @@ const path = require('path')
 const { nanoid } = require('nanoid')
 const delay = require('delay')
 const concat = require('it-concat')
-const { expect } = require('./utils/chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./utils/daemon-factory')
 
 const isWindows = os.platform() === 'win32'

test/utils/circuit.js

@@ -7,7 +7,7 @@ const WS = require('libp2p-websockets')
 const filters = require('libp2p-websockets/src/filters')
 const transportKey = WS.prototype[Symbol.toStringTag]
 
-const { expect } = require('./chai')
+const { expect } = require('aegir/utils/chai')
 const daemonFactory = require('./daemon-factory')
 
 exports.createProc = addrs => daemonFactory.spawn({