refactor: dht before and after methods to async syntax

src/dht/find-peer.js

@@ -1,9 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -16,30 +14,13 @@ module.exports = (createCommon, options) => {
     let nodeA
     let nodeB
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-
-          nodeA = nodes[0]
-          nodeB = nodes[1]
-
-          connect(nodeB, nodeA.peerId.addresses[0], done)
-        })
-      })
+    before(async () => {
+      nodeA = await common.setup()
+      nodeB = await common.setup()
+      await nodeB.swarm.connect(nodeA.peerId.addresses[0])
     })
 
-    after(function (done) {
-      this.timeout(50 * 1000)
-
-      common.teardown(done)
-    })
+    after(() => common.teardown())
 
     it('should find other peers', async () => {
       const res = await nodeA.dht.findPeer(nodeB.peerId.id)

src/dht/find-provs.js

@@ -2,11 +2,8 @@
 'use strict'
 
 const multihashing = require('multihashing-async')
-const parallel = require('async/parallel')
 const CID = require('cids')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
 
 async function fakeCid () {
   const bytes = Buffer.from(`TEST${Date.now()}`)
@@ -26,29 +23,18 @@ module.exports = (createCommon, options) => {
     let nodeB
     let nodeC
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(3, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-
-          nodeA = nodes[0]
-          nodeB = nodes[1]
-          nodeC = nodes[2]
-
-          parallel([
-            (cb) => connect(nodeB, nodeA.peerId.addresses[0], cb),
-            (cb) => connect(nodeC, nodeB.peerId.addresses[0], cb)
-          ], done)
-        })
-      })
+    before(async () => {
+      nodeA = await common.setup()
+      nodeB = await common.setup()
+      nodeC = await common.setup()
+      await Promise.all([
+        nodeB.swarm.connect(nodeA.peerId.addresses[0]),
+        nodeC.swarm.connect(nodeB.peerId.addresses[0])
+      ])
     })
 
+    after(() => common.teardown())
+
     let providedCid
     before('add providers for the same cid', async function () {
       const cids = await Promise.all([

src/dht/get.js

@@ -2,9 +2,7 @@
 'use strict'
 
 const hat = require('hat')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -17,30 +15,13 @@ module.exports = (createCommon, options) => {
     let nodeA
     let nodeB
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-
-          nodeA = nodes[0]
-          nodeB = nodes[1]
-
-          connect(nodeA, nodeB.peerId.addresses[0], done)
-        })
-      })
+    before(async () => {
+      nodeA = await common.setup()
+      nodeB = await common.setup()
+      await nodeA.swarm.connect(nodeB.peerId.addresses[0])
     })
 
-    after(function (done) {
-      this.timeout(50 * 1000)
-
-      common.teardown(done)
-    })
+    after(() => common.teardown())
 
     it('should error when getting a non-existent key from the DHT', () => {
       return expect(nodeA.dht.get('non-existing', { timeout: 100 })).to.eventually.be.rejected

src/dht/provide.js

@@ -2,9 +2,7 @@
 'use strict'
 
 const CID = require('cids')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -16,27 +14,13 @@ module.exports = (createCommon, options) => {
 
     let ipfs
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-          ipfs = nodes[0]
-          connect(ipfs, nodes[1].peerId.addresses[0], done)
-        })
-      })
+    before(async () => {
+      ipfs = await common.setup()
+      const nodeB = await common.setup()
+      await ipfs.swarm.connect(nodeB.peerId.addresses[0])
     })
 
-    after(function (done) {
-      this.timeout(50 * 1000)
-
-      common.teardown(done)
-    })
+    after(() => common.teardown())
 
     it('should provide local CID', async () => {
       const res = await ipfs.add(Buffer.from('test'))

src/dht/put.js

@@ -1,9 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const { spawnNodesWithId } = require('../utils/spawn')
-const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
+const { getDescribe, getIt } = require('../utils/mocha')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -16,25 +14,13 @@ module.exports = (createCommon, options) => {
     let nodeA
     let nodeB
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-
-          nodeA = nodes[0]
-          nodeB = nodes[1]
-          connect(nodeA, nodeB.peerId.addresses[0], done)
-        })
-      })
+    before(async () => {
+      nodeA = await common.setup()
+      nodeB = await common.setup()
+      await nodeA.swarm.connect(nodeB.peerId.addresses[0])
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should put a value to the DHT', async () => {
       const key = Buffer.from('QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')

src/dht/query.js

@@ -2,9 +2,7 @@
 'use strict'
 
 const pTimeout = require('p-timeout')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -17,30 +15,13 @@ module.exports = (createCommon, options) => {
     let nodeA
     let nodeB
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-
-          nodeA = nodes[0]
-          nodeB = nodes[1]
-
-          connect(nodeB, nodeA.peerId.addresses[0], done)
-        })
-      })
+    before(async () => {
+      nodeA = await common.setup()
+      nodeB = await common.setup()
+      await nodeB.swarm.connect(nodeA.peerId.addresses[0])
     })
 
-    after(function (done) {
-      this.timeout(50 * 1000)
-
-      common.teardown(done)
-    })
+    after(() => common.teardown())
 
     it('should return the other node in the query', async function () {
       const timeout = 150 * 1000