refactor: pubsub before and after methods to async syntax

Author: Pedro Santos

src/pubsub/ls.js

@@ -16,19 +16,8 @@ module.exports = (createCommon, options) => {
     let ipfs
     let subscribedTopics = []
 
-    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()
-        factory.spawnNode((err, node) => {
-          expect(err).to.not.exist()
-          ipfs = node
-          done()
-        })
-      })
+    before(async () => {
+      ipfs = await common.setup()
     })
 
     afterEach(async () => {
@@ -39,7 +28,7 @@ module.exports = (createCommon, options) => {
       await delay(100)
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should return an empty list when no topics are subscribed', async () => {
       const topics = await ipfs.pubsub.ls()

src/pubsub/peers.js

@@ -1,11 +1,8 @@
 /* eslint-env mocha */
 'use strict'
 
-const parallel = require('async/parallel')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { waitForPeers, getTopic } = require('./utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const { connect } = require('../utils/swarm')
 const delay = require('delay')
 
 module.exports = (createCommon, options) => {
@@ -21,24 +18,17 @@ module.exports = (createCommon, options) => {
     let ipfs3
     let subscribedTopics = []
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(100 * 1000)
+    before(async () => {
+      ipfs1 = await common.setup()
+      ipfs2 = await common.setup()
+      ipfs3 = await common.setup()
 
-      common.setup((err, factory) => {
-        if (err) return done(err)
-
-        spawnNodesWithId(3, factory, (err, nodes) => {
-          if (err) return done(err)
-
-          ipfs1 = nodes[0]
-          ipfs2 = nodes[1]
-          ipfs3 = nodes[2]
+      const ipfs2Addr = ipfs2.peerId.addresses.find((a) => a.includes('127.0.0.1'))
+      const ipfs3Addr = ipfs3.peerId.addresses.find((a) => a.includes('127.0.0.1'))
 
-          done()
-        })
-      })
+      await ipfs1.swarm.connect(ipfs2Addr)
+      await ipfs1.swarm.connect(ipfs3Addr)
+      await ipfs2.swarm.connect(ipfs3Addr)
     })
 
     afterEach(async () => {
@@ -51,17 +41,7 @@ module.exports = (createCommon, options) => {
       await delay(100)
     })
 
-    after((done) => common.teardown(done))
-
-    before((done) => {
-      const ipfs2Addr = ipfs2.peerId.addresses.find((a) => a.includes('127.0.0.1'))
-      const ipfs3Addr = ipfs3.peerId.addresses.find((a) => a.includes('127.0.0.1'))
-
-      parallel([
-        (cb) => connect(ipfs1, [ipfs2Addr, ipfs3Addr], cb),
-        (cb) => connect(ipfs2, ipfs3Addr, cb)
-      ], done)
-    })
+    after(() => common.teardown())
 
     it('should not error when not subscribed to a topic', async () => {
       const topic = getTopic()

src/pubsub/publish.js

@@ -3,7 +3,7 @@
 
 const hat = require('hat')
 const { getTopic } = require('./utils')
-const { getDescribe, getIt, expect } = require('../utils/mocha')
+const { getDescribe, getIt } = require('../utils/mocha')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -15,22 +15,11 @@ 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()
-        factory.spawnNode((err, node) => {
-          expect(err).to.not.exist()
-          ipfs = node
-          done()
-        })
-      })
+    before(async () => {
+      ipfs = await common.setup()
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should publish message from string', () => {
       const topic = getTopic()

src/pubsub/subscribe.js

@@ -4,7 +4,6 @@
 
 const pushable = require('it-pushable')
 const { collect } = require('streaming-iterables')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { waitForPeers, getTopic } = require('./utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const delay = require('delay')
@@ -22,23 +21,9 @@ module.exports = (createCommon, options) => {
     let topic
     let subscribedTopics = []
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(100 * 1000)
-
-      common.setup((err, factory) => {
-        if (err) return done(err)
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          if (err) return done(err)
-
-          ipfs1 = nodes[0]
-          ipfs2 = nodes[1]
-
-          done()
-        })
-      })
+    before(async () => {
+      ipfs1 = await common.setup()
+      ipfs2 = await common.setup()
     })
 
     beforeEach(() => {
@@ -56,7 +41,7 @@ module.exports = (createCommon, options) => {
       await delay(100)
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     describe('single node', () => {
       it('should subscribe to one topic', async () => {

src/pubsub/unsubscribe.js

@@ -16,22 +16,11 @@ 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()
-        factory.spawnNode((err, node) => {
-          expect(err).to.not.exist()
-          ipfs = node
-          done()
-        })
-      })
+    before(async () => {
+      ipfs = await common.setup()
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     // Browser/worker has max ~5 open HTTP requests to the same origin
     const count = isBrowser || isWebWorker || isElectronRenderer ? 5 : 10