refactor: ping before and after methods to async syntax

Author: Pedro Santos

src/ping/ping-pull-stream.js

@@ -2,43 +2,27 @@
 'use strict'
 
 const pullToPromise = require('pull-to-promise')
-const series = require('async/series')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const { isPong } = require('./utils.js')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
   const it = getIt(options)
   const common = createCommon()
 
   describe('.pingPullStream', function () {
-    // TODO revisit when https://github.com/ipfs/go-ipfs/issues/5799 is resolved
-    this.timeout(2 * 60 * 1000)
+    this.timeout(60 * 1000)
 
     let ipfsA
     let ipfsB
 
-    before(function (done) {
-      common.setup((err, factory) => {
-        if (err) return done(err)
-
-        series([
-          (cb) => {
-            spawnNodesWithId(2, factory, (err, nodes) => {
-              if (err) return cb(err)
-              ipfsA = nodes[0]
-              ipfsB = nodes[1]
-              cb()
-            })
-          },
-          (cb) => connect(ipfsA, ipfsB.peerId.addresses[0], cb)
-        ], done)
-      })
+    before(async () => {
+      ipfsA = await common.setup()
+      ipfsB = await common.setup()
+      await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should send the specified number of packets over pull stream', async () => {
       const count = 3

src/ping/ping-readable-stream.js

@@ -3,43 +3,27 @@
 
 const pump = require('pump')
 const { Writable } = require('stream')
-const series = require('async/series')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const { isPong } = require('./utils.js')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
   const it = getIt(options)
   const common = createCommon()
 
   describe('.pingReadableStream', function () {
-    // TODO revisit when https://github.com/ipfs/go-ipfs/issues/5799 is resolved
-    this.timeout(2 * 60 * 1000)
+    this.timeout(60 * 1000)
 
     let ipfsA
     let ipfsB
 
-    before(function (done) {
-      common.setup((err, factory) => {
-        if (err) return done(err)
-
-        series([
-          (cb) => {
-            spawnNodesWithId(2, factory, (err, nodes) => {
-              if (err) return cb(err)
-              ipfsA = nodes[0]
-              ipfsB = nodes[1]
-              cb()
-            })
-          },
-          (cb) => connect(ipfsA, ipfsB.peerId.addresses[0], cb)
-        ], done)
-      })
+    before(async () => {
+      ipfsA = await common.setup()
+      ipfsB = await common.setup()
+      await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should send the specified number of packets over readable stream', () => {
       let packetNum = 0

src/ping/ping.js

@@ -1,45 +1,27 @@
 /* eslint-env mocha */
 'use strict'
 
-const series = require('async/series')
-const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const { expectIsPingResponse, isPong } = require('./utils')
-const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
   const it = getIt(options)
   const common = createCommon()
 
   describe('.ping', function () {
-    // TODO revisit when https://github.com/ipfs/go-ipfs/issues/5799 is resolved
-    this.timeout(2 * 60 * 1000)
+    this.timeout(60 * 1000)
 
     let ipfsA
     let ipfsB
 
-    before(function (done) {
-      this.timeout(60 * 1000)
-
-      common.setup((err, factory) => {
-        if (err) return done(err)
-
-        series([
-          (cb) => {
-            spawnNodesWithId(2, factory, (err, nodes) => {
-              if (err) return cb(err)
-              ipfsA = nodes[0]
-              ipfsB = nodes[1]
-              cb()
-            })
-          },
-          (cb) => connect(ipfsA, ipfsB.peerId.addresses[0], cb)
-        ], done)
-      })
+    before(async () => {
+      ipfsA = await common.setup()
+      ipfsB = await common.setup()
+      await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should send the specified number of packets', async () => {
       const count = 3