chore: upgrade to latest ipfsd-ctl (#2772)

* chore: upgrade to latest ipfsd-ctl

* fix: pin go-ipfs-dep version otherwise you get the wrong one

Author: achingbrain

.aegir.js

@@ -6,7 +6,6 @@ const EchoServer = require('interface-ipfs-core/src/utils/echo-http-server')
 const webRTCStarSigServer = require('libp2p-webrtc-star/src/sig-server')
 const path = require('path')
 const webpack = require('webpack')
-const os = require('os')
 
 const preloadNode = MockPreloadNode.createNode()
 const echoServer = EchoServer.createServer()
@@ -69,14 +68,8 @@ module.exports = {
           port: 43134
         }, {
           type: 'js',
-          ipfsModule: {
-            path: __dirname,
-            ref: require(__dirname)
-          },
-          ipfsHttpModule: {
-            path: require.resolve('ipfs-http-client'),
-            ref: require('ipfs-http-client')
-          },
+          ipfsModule: require(__dirname),
+          ipfsHttpModule: require('ipfs-http-client'),
           ipfsBin: path.join(__dirname, 'src', 'cli', 'bin.js'),
           ipfsOptions: {
             config: {
@@ -89,7 +82,7 @@ module.exports = {
           }
         }, {
           go: {
-            ipfsBin: require.resolve(`go-ipfs-dep/go-ipfs/ipfs${os.platform() === 'win32' ? '.exe' : ''}`)
+            ipfsBin: require('go-ipfs-dep').path()
           }
         }).start()
       },

examples/circuit-relaying/test.js

@@ -7,14 +7,8 @@ const execa = require('execa')
 const delay = require('delay')
 const { createFactory } = require('ipfsd-ctl')
 const df = createFactory({
-  ipfsModule: {
-    path: require.resolve('../../src'),
-    ref: require('../../src')
-  },
-  ipfsHttpModule: {
-    path: require.resolve('ipfs-http-client'),
-    ref: require('ipfs-http-client')
-  }
+  ipfsModule: require('../../src'),
+  ipfsHttpModule: require('ipfs-http-client')
 })
 const {
   startServer

examples/exchange-files-in-browser/test.js

@@ -7,14 +7,8 @@ const execa = require('execa')
 const delay = require('delay')
 const { createFactory } = require('ipfsd-ctl')
 const df = createFactory({
-  ipfsModule: {
-    path: require.resolve('../../src'),
-    ref: require('../../src')
-  },
-  ipfsHttpModule: {
-    path: require.resolve('ipfs-http-client'),
-    ref: require('ipfs-http-client')
-  }
+  ipfsModule: require('../../src'),
+  ipfsHttpModule: require('ipfs-http-client')
 }, {
   js: {
     ipfsBin: path.resolve(`${__dirname}/../../src/cli/bin.js`)

examples/explore-ethereum-blockchain/test.js

@@ -4,14 +4,8 @@ const fs = require('fs-extra')
 const path = require('path')
 const { createFactory } = require('ipfsd-ctl')
 const df = createFactory({
-  ipfsModule: {
-    path: require.resolve('../../src'),
-    ref: require('../../src')
-  },
-  ipfsHttpModule: {
-    path: require.resolve('ipfs-http-client'),
-    ref: require('ipfs-http-client')
-  }
+  ipfsModule: require('../../src'),
+  ipfsHttpModule: require('ipfs-http-client')
 }, {
   js: {
     ipfsBin: path.resolve(`${__dirname}/../../src/cli/bin.js`)

package.json

@@ -182,11 +182,11 @@
     "dir-compare": "^1.7.3",
     "execa": "^3.0.0",
     "form-data": "^3.0.0",
-    "go-ipfs-dep": "^0.4.23",
+    "go-ipfs-dep": "0.4.23-3",
     "hat": "0.0.3",
     "interface-ipfs-core": "^0.132.0",
-    "ipfs-interop": "github:ipfs/interop#refactor/async-await",
-    "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl#remove-option-normalisation",
+    "ipfs-interop": "^1.0.0",
+    "ipfsd-ctl": "^3.0.0",
     "ncp": "^2.0.0",
     "p-event": "^4.1.0",
     "p-map": "^3.0.0",

test/http-api/interface.js

@@ -14,14 +14,8 @@ describe('interface-ipfs-core over ipfs-http-client tests', function () {
   const commonOptions = {
     test: true,
     type: 'js',
-    ipfsModule: {
-      path: require.resolve('../../src'),
-      ref: IPFS
-    },
-    ipfsHttpModule: {
-      path: require.resolve('ipfs-http-client'),
-      ref: require('ipfs-http-client')
-    },
+    ipfsModule: IPFS,
+    ipfsHttpModule: require('ipfs-http-client'),
     ipfsOptions: {
       pass: 'ipfs-is-awesome-software'
     }

test/utils/factory.js

@@ -6,14 +6,8 @@ const { isNode, isBrowser } = require('ipfs-utils/src/env')
 const commonOptions = {
   test: true,
   type: 'proc',
-  ipfsHttpModule: {
-    path: require.resolve('ipfs-http-client'),
-    ref: require('ipfs-http-client')
-  },
-  ipfsModule: {
-    path: require.resolve('../../src'),
-    ref: require('../../src')
-  },
+  ipfsHttpModule: require('ipfs-http-client'),
+  ipfsModule: require('../../src'),
   ipfsOptions: {
     pass: 'ipfs-is-awesome-software',
     libp2p: {