refactor: pin before and after methods to async syntax

Author: Pedro Santos

src/pin/add.js

@@ -1,7 +1,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const each = require('async/each')
 const { fixtures } = require('./utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
@@ -11,32 +10,18 @@ module.exports = (createCommon, options) => {
   const common = createCommon()
 
   describe('.pin.add', function () {
-    this.timeout(50 * 1000)
+    this.timeout(60 * 1000)
 
     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
-          populate()
-        })
-      })
-
-      function populate () {
-        each(fixtures.files, (file, cb) => {
-          ipfs.add(file.data, { pin: false }, cb)
-        }, done)
-      }
+    before(async () => {
+      ipfs = await common.setup()
+      await Promise.all(fixtures.files.map(file => {
+        return ipfs.add(file.data, { pin: false })
+      }))
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should add a pin', async () => {
       const pinset = await ipfs.pin.add(fixtures.files[0].cid, { recursive: false })

src/pin/ls.js

@@ -1,7 +1,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const series = require('async/series')
 const { fixtures } = require('./utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
@@ -11,43 +10,25 @@ module.exports = (createCommon, options) => {
   const common = createCommon()
 
   describe('.pin.ls', function () {
-    this.timeout(50 * 1000)
+    this.timeout(60 * 1000)
 
     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
-          populate()
-        })
-      })
-
-      function populate () {
-        series([
-          // two files wrapped in directories, only root CID pinned recursively
-          cb => {
-            const dir = fixtures.directory.files.map((file) => ({ path: file.path, content: file.data }))
-            ipfs.add(dir, { pin: false, cidVersion: 0 }, cb)
-          },
-          cb => ipfs.pin.add(fixtures.directory.cid, { recursive: true }, cb),
-          // a file (CID pinned recursively)
-          cb => ipfs.add(fixtures.files[0].data, { pin: false, cidVersion: 0 }, cb),
-          cb => ipfs.pin.add(fixtures.files[0].cid, { recursive: true }, cb),
-          // a single CID (pinned directly)
-          cb => ipfs.add(fixtures.files[1].data, { pin: false, cidVersion: 0 }, cb),
-          cb => ipfs.pin.add(fixtures.files[1].cid, { recursive: false }, cb)
-        ], done)
-      }
+    before(async () => {
+      ipfs = await common.setup()
+      // two files wrapped in directories, only root CID pinned recursively
+      const dir = fixtures.directory.files.map((file) => ({ path: file.path, content: file.data }))
+      await ipfs.add(dir, { pin: false, cidVersion: 0 })
+      await ipfs.pin.add(fixtures.directory.cid, { recursive: true })
+      // a file (CID pinned recursively)
+      await ipfs.add(fixtures.files[0].data, { pin: false, cidVersion: 0 })
+      await ipfs.pin.add(fixtures.files[0].cid, { recursive: true })
+      // a single CID (pinned directly)
+      await ipfs.add(fixtures.files[1].data, { pin: false, cidVersion: 0 })
+      await ipfs.pin.add(fixtures.files[1].cid, { recursive: false })
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     // 1st, because ipfs.add pins automatically
     it('should list all recursive pins', async () => {

src/pin/rm.js

@@ -1,7 +1,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const series = require('async/series')
 const { fixtures } = require('./utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
@@ -11,35 +10,19 @@ module.exports = (createCommon, options) => {
   const common = createCommon()
 
   describe('.pin.rm', function () {
-    this.timeout(50 * 1000)
+    this.timeout(60 * 1000)
 
     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
-          populate()
-        })
-      })
-
-      function populate () {
-        series([
-          cb => ipfs.add(fixtures.files[0].data, { pin: false }, cb),
-          cb => ipfs.pin.add(fixtures.files[0].cid, { recursive: true }, cb),
-          cb => ipfs.add(fixtures.files[1].data, { pin: false }, cb),
-          cb => ipfs.pin.add(fixtures.files[1].cid, { recursive: false }, cb)
-        ], done)
-      }
+    before(async () => {
+      ipfs = await common.setup()
+      await ipfs.add(fixtures.files[0].data, { pin: false })
+      await ipfs.pin.add(fixtures.files[0].cid, { recursive: true })
+      await ipfs.add(fixtures.files[1].data, { pin: false })
+      await ipfs.pin.add(fixtures.files[1].cid, { recursive: false })
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should remove a recursive pin', async () => {
       const removedPinset = await ipfs.pin.rm(fixtures.files[0].cid, { recursive: true })