chore: update ipfsd-ctl to latest version (#1237)

* chore: update ipfsd-ctl to latest version

Also uses the same ipfsd factory for all tests.

* chore: remove gh dep version

Author: achingbrain

.aegir.js

@@ -2,7 +2,14 @@
 
 const createServer = require('ipfsd-ctl').createServer
 const EchoServer = require('interface-ipfs-core/src/utils/echo-http-server')
-const server = createServer()
+const server = createServer({
+  host: '127.0.0.1',
+  port: 43134
+}, {
+  type: 'go',
+  ipfsHttpModule: require('./'),
+  ipfsBin: require('go-ipfs-dep').path()
+})
 const echoServer = EchoServer.createServer()
 
 module.exports = {

package.json

@@ -67,9 +67,9 @@
     "aegir": "^20.4.1",
     "async": "^3.1.0",
     "browser-process-platform": "~0.1.1",
-    "go-ipfs-dep": "^0.4.23",
+    "go-ipfs-dep": "^0.4.23-3",
     "interface-ipfs-core": "^0.131.7",
-    "ipfsd-ctl": "^2.1.0",
+    "ipfsd-ctl": "^3.0.0",
     "it-all": "^1.0.1",
     "it-concat": "^1.0.0",
     "it-pipe": "^1.1.0",

test/commands.spec.js

@@ -2,7 +2,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('.commands', function () {
   this.timeout(60 * 1000)

test/constructor.spec.js

@@ -3,7 +3,7 @@
 
 const multiaddr = require('multiaddr')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 const ipfsClient = require('../src/index.js')
 
 describe('ipfs-http-client constructor tests', () => {

test/dag.spec.js

@@ -6,7 +6,7 @@
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const { DAGNode } = require('ipld-dag-pb')
 const CID = require('cids')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 let ipfs
 

test/diag.spec.js

@@ -3,7 +3,7 @@
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const platform = require('browser-process-platform')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('.diag', function () {
   this.timeout(50 * 1000)

test/files-mfs.spec.js

@@ -9,7 +9,7 @@ const all = require('it-all')
 const pipe = require('it-pipe')
 const { TimeoutError } = require('ky-universal')
 
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 const testfile = loadFixture('test/fixtures/testfile.txt')
 

test/get.spec.js

@@ -8,7 +8,7 @@ const loadFixture = require('aegir/fixtures')
 const all = require('it-all')
 const concat = require('it-concat')
 
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('.get (specific go-ipfs features)', function () {
   this.timeout(60 * 1000)

test/interface.spec.js

@@ -2,27 +2,13 @@
 'use strict'
 
 const tests = require('interface-ipfs-core')
-const merge = require('merge-options')
-const { createFactory } = require('ipfsd-ctl')
-const { findBin } = require('ipfsd-ctl/src/utils')
+const factory = require('./utils/factory')
 const isWindows = process.platform && process.platform === 'win32'
 
 /** @typedef {import("ipfsd-ctl").ControllerOptions} ControllerOptions */
 
 describe('interface-ipfs-core tests', () => {
-  /** @type ControllerOptions */
-  const commonOptions = {
-    test: true,
-    ipfsHttpModule: {
-      path: require.resolve('../src'),
-      ref: require('../src')
-    },
-    ipfsOptions: {
-      pass: 'ipfs-is-awesome-software'
-    },
-    ipfsBin: findBin('go')
-  }
-  const commonFactory = createFactory(commonOptions)
+  const commonFactory = factory()
 
   tests.root(commonFactory, {
     skip: [
@@ -320,13 +306,13 @@ describe('interface-ipfs-core tests', () => {
 
   tests.miscellaneous(commonFactory)
 
-  tests.name(createFactory(merge(commonOptions,
+  tests.name(factory(
     {
       ipfsOptions: {
         offline: true
       }
     }
-  )), {
+  ), {
     skip: [
       {
         name: 'should resolve a record from peerid as cidv1 in base32',
@@ -335,15 +321,15 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.namePubsub(createFactory(merge(commonOptions,
+  tests.namePubsub(factory(
     {
       ipfsOptions: {
         EXPERIMENTAL: {
           ipnsPubsub: true
         }
       }
     }
-  )), {
+  ), {
     skip: [
       // name.pubsub.cancel
       {
@@ -371,7 +357,7 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.pubsub(createFactory(commonOptions, {
+  tests.pubsub(factory({}, {
     go: {
       args: ['--enable-pubsub-experiment']
     }

test/key.spec.js

@@ -2,7 +2,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('.key', function () {
   this.timeout(50 * 1000)

test/log.spec.js

@@ -4,7 +4,7 @@
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const all = require('it-all')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('.log', function () {
   this.timeout(100 * 1000)

test/ping.spec.js

@@ -4,7 +4,7 @@
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const all = require('it-all')
 
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 // Determine if a ping response object is a pong, or something else, like a status message
 function isPong (pingResponse) {

test/repo.spec.js

@@ -2,7 +2,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('.repo', function () {
   this.timeout(50 * 1000) // slow CI

test/stats.spec.js

@@ -3,7 +3,7 @@
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const all = require('it-all')
-const f = require('./utils/factory')
+const f = require('./utils/factory')()
 
 describe('stats', function () {
   this.timeout(50 * 1000) // slow CI

test/utils/factory.js

@@ -1,15 +1,24 @@
 'use strict'
+
 const { createFactory } = require('ipfsd-ctl')
-const { findBin } = require('ipfsd-ctl/src/utils')
+const merge = require('merge-options')
+const { isNode } = require('ipfs-utils/src/env')
 
-const factory = createFactory({
+const commonOptions = {
   test: 'true',
   type: 'go',
-  ipfsBin: findBin('go'),
-  ipfsHttpModule: {
-    path: require.resolve('../../src'),
-    ref: require('../../src')
+  ipfsHttpModule: require('../../src')
+}
+
+const commonOverrides = {
+  go: {
+    ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined
   }
-})
+}
+
+const factory = (options = {}, overrides = {}) => createFactory(
+  merge(commonOptions, options),
+  merge(commonOverrides, overrides)
+)
 
 module.exports = factory