refactor: name before and after methods to async syntax

Author: Pedro Santos

src/name/publish.js

@@ -4,7 +4,6 @@
 const hat = require('hat')
 
 const { fixture } = require('./utils')
-const { spawnNodeWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 module.exports = (createCommon, options) => {
@@ -17,41 +16,28 @@ module.exports = (createCommon, options) => {
     let ipfs
     let nodeId
 
-    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()
-
-        spawnNodeWithId(factory, (err, node) => {
-          expect(err).to.not.exist()
-
-          ipfs = node
-          nodeId = node.peerId.id
-
-          ipfs.add(fixture.data, { pin: false }, done)
-        })
-      })
+    before(async () => {
+      ipfs = await common.setup()
+      nodeId = ipfs.peerId.id
+      await ipfs.add(fixture.data, { pin: false })
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should publish an IPNS record with the default params', async function () {
       this.timeout(50 * 1000)
 
       const value = fixture.cid
 
-      const res = await ipfs.name.publish(value, { 'allow-offline': true })
+      const res = await ipfs.name.publish(value, { allowOffline: true })
       expect(res).to.exist()
       expect(res.name).to.equal(nodeId)
       expect(res.value).to.equal(`/ipfs/${value}`)
     })
 
     it('should publish correctly with the lifetime option and resolve', async () => {
       const [{ path }] = await ipfs.add(Buffer.from('should publish correctly with the lifetime option and resolve'))
-      await ipfs.name.publish(path, { 'allow-offline': true, resolve: false, lifetime: '2h' })
+      await ipfs.name.publish(path, { allowOffline: true, resolve: false, lifetime: '2h' })
 
       return expect(await ipfs.name.resolve(`/ipns/${nodeId}`)).to.eq(`/ipfs/${path}`)
     })
@@ -66,7 +52,7 @@ module.exports = (createCommon, options) => {
         lifetime: '1m',
         ttl: '10s',
         key: 'self',
-        'allow-offline': true
+        allowOffline: true
       }
 
       const res = await ipfs.name.publish(value, options)
@@ -84,7 +70,7 @@ module.exports = (createCommon, options) => {
         lifetime: '24h',
         ttl: '10s',
         key: keyName,
-        'allow-offline': true
+        allowOffline: true
       }
 
       const key = await ipfs.key.gen(keyName, { type: 'rsa', size: 2048 })

src/name/resolve.js

@@ -2,7 +2,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const { spawnNodeWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const delay = require('delay')
 const CID = require('cids')
@@ -16,21 +15,12 @@ module.exports = (createCommon, options) => {
     let ipfs
     let nodeId
 
-    before(function (done) {
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodeWithId(factory, (err, node) => {
-          expect(err).to.not.exist()
-
-          ipfs = node
-          nodeId = node.peerId.id
-          done()
-        })
-      })
+    before(async () => {
+      ipfs = await common.setup()
+      nodeId = ipfs.peerId.id
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should resolve a record default options', async function () {
       this.timeout(20 * 1000)