chore: more clean up

.aegir.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const parallel = require('async/parallel')
-const spawnTools = require('./test/utils/spawn-tools')
-const js = spawnTools.spawnJsNode
-// const go = spawnTools.spawnGoNode
-const stop = spawnTools.stopNodes
+const ads = require('./test/utils/another-daemon-spawner')
+const js = ads.spawnJsNode
+// const go = ads.spawnGoNode
+const stop = ads.stopNodes
 
 /*
  * spawns a daemon with ports numbers starting in 10 and ending in `num`

test/interop/browser.js

@@ -1,4 +1,10 @@
 /* eslint-env mocha */
 'use strict'
 
-describe.skip('browser interop test', () => {})
+describe('browser interop tests', () => {
+  it('need to get written', function (done) {
+    this.timeout(10 * 1000)
+    // for teardown time
+    setTimeout(done, 5 * 1000)
+  })
+})

test/interop/circuit.js

@@ -13,10 +13,10 @@ const waterfall = require('async/waterfall')
 const multiaddr = require('multiaddr')
 const crypto = require('crypto')
 
-const spawnTools = require('./test/utils/spawn-tools')
-const js = spawnTools.spawnJsNode
-const go = spawnTools.spawnGoNode
-const stop = spawnTools.stopNodes
+const ads = require('../utils/another-daemon-spawner')
+const js = ads.spawnJsNode
+const go = ads.spawnGoNode
+const stop = ads.stopNodes
 
 describe.skip('circuit interop', function () {
   let jsTCP

test/interop/exchange-files.js

@@ -19,8 +19,8 @@ const rmDir = promisify(rimraf)
 
 const tmpDir = require('./util').tmpDir
 
-const GoDaemon = require('./spawner/go')
-const JsDaemon = require('./spawner/js')
+const GoDaemon = require('../utils/interop-daemon-spawner/go')
+const JsDaemon = require('../utils/interop-daemon-spawner/js')
 
 const sizes = [
   1024,
@@ -42,12 +42,13 @@ const dirs = [
   100
 ]
 
-describe('basic', () => {
+describe.only('exchange files', () => {
   let goDaemon
   let jsDaemon
   let js2Daemon
 
-  before((done) => {
+  before(function (done) {
+    this.timeout(15 * 1000)
     goDaemon = new GoDaemon()
     jsDaemon = new JsDaemon({port: 1})
     js2Daemon = new JsDaemon({port: 2})

test/interop/kad-dht.js

@@ -11,8 +11,8 @@ const parallel = require('async/parallel')
 const waterfall = require('async/waterfall')
 const bl = require('bl')
 
-const GODaemon = require('./spawner/go')
-const JSDaemon = require('./spawner/js')
+const GODaemon = require('../utils/interop-daemon-spawner/go')
+const JSDaemon = require('../utils/interop-daemon-spawner/js')
 
 describe.skip('kad-dht', () => {
   describe('a JS node in the land of Go', () => {

test/interop/repo.js

@@ -10,8 +10,8 @@ const bl = require('bl')
 const crypto = require('crypto')
 const os = require('os')
 
-const GoDaemon = require('./spawner/go')
-const JsDaemon = require('./spawner/js')
+const GoDaemon = require('../utils/interop-daemon-spawner/go')
+const JsDaemon = require('../utils/interop-daemon-spawner/js')
 
 function catAndCheck (daemon, hash, data, callback) {
   waterfall([

test/utils/spawn-tools.js → test/utils/another-daemon-spawner.js

@@ -6,24 +6,24 @@ const waterfall = require('async/waterfall')
 const series = require('async/series')
 
 const relayConfig = require('./ipfs-factory-daemon/default-config.json')
-const GoDaemon = require('../interop/spawner/go')
 const Factory = require('./ipfs-factory-daemon')
+const GoDaemon = require('./interop-daemon-spawner/go')
 
 const nodes = []
 const factory = new Factory()
 exports = module.exports
 
-exports.spawnGoNode = (addrs, hop, api, gateway, cb) => {
+exports.spawnGoNode = (addrs, hop, api, gateway, callback) => {
   if (typeof hop === 'function') {
-    cb = hop
+    callback = hop
     hop = false
   }
   if (typeof api === 'function') {
-    cb = api
+    callback = api
     api = 0
   }
   if (typeof gateway === 'function') {
-    cb = gateway
+    callback = gateway
     gateway = 0
   }
 
@@ -51,71 +51,67 @@ exports.spawnGoNode = (addrs, hop, api, gateway, cb) => {
 
   daemon.start((err) => {
     if (err) {
-      return cb(err)
+      return callback(err)
     }
     daemon.api.id((err, id) => {
       if (err) {
-        return cb(err)
+        return callback(err)
       }
       nodes.push(daemon)
-      cb(null, daemon, id.addresses)
+      callback(null, daemon, id.addresses)
     })
   })
 }
 
-exports.spawnJsNode = (addrs, hop, api, gateway, cb) => {
+exports.spawnJsNode = (addrs, hop, api, gateway, callback) => {
   let relayPeer
   let relayAddrs
 
   if (typeof hop === 'function') {
-    cb = hop
+    callback = hop
     hop = false
   }
   if (typeof api === 'function') {
-    cb = api
+    callback = api
     api = 0
   }
   if (typeof gateway === 'function') {
-    cb = gateway
+    callback = gateway
     gateway = 0
   }
 
   api = api || 0
   gateway = gateway || 0
 
-  cb = cb || (() => {})
+  callback = callback || function noop () {}
 
   waterfall([
-    (pCb) => {
-      factory.spawnNode(null,
-        Object.assign(relayConfig, {
-          Addresses: {
-            Swarm: addrs,
-            API: `/ip4/0.0.0.0/tcp/${api}`,
-            Gateway: `/ip4/0.0.0.0/tcp/${gateway}`
-          },
-          EXPERIMENTAL: {
-            Swarm: {
-              DisableRelay: false,
-              EnableRelayHop: hop
-            }
-          }
-        }), pCb)
-    },
-    (node, pCb) => {
+    (cb) => factory.spawnNode(null, Object.assign(relayConfig, {
+      Addresses: {
+        Swarm: addrs,
+        API: `/ip4/0.0.0.0/tcp/${api}`,
+        Gateway: `/ip4/0.0.0.0/tcp/${gateway}`
+      },
+      EXPERIMENTAL: {
+        Swarm: {
+          DisableRelay: false,
+          EnableRelayHop: hop
+        }
+      }
+    }), cb),
+    (node, cb) => {
       relayPeer = node
-      pCb()
+      relayPeer.swarm.localAddrs(cb)
     },
-    (pCb) => relayPeer.swarm.localAddrs(pCb),
-    (addrs, pCb) => {
+    (addrs, cb) => {
       relayAddrs = addrs
-      pCb()
+      cb()
     }
   ], (err) => {
     if (err) {
-      return cb(err)
+      return callback(err)
     }
-    cb(null, relayPeer, relayAddrs)
+    callback(null, relayPeer, relayAddrs)
   })
 }