refactor: make ipfs and http client peer dependencies (#90)

By depending on a certain version of ipfs and the ipfs http client
it means we can't run all the tests on other versions of ipfs/the
http client as the `require`s resolve to the wrong version.

This PR makes them peer dependencies to allow the tester/testing
environment to specify which versions of modules we want to test.

.travis.yml

@@ -18,7 +18,9 @@ os:
   - linux
   - osx
 
-script: npx nyc -s npm run test:node -- --bail
+script:
+  - npm install ipfs go-ipfs-dep
+  - npx nyc -s npm run test:node -- --bail
 after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
 
 jobs:
@@ -36,13 +38,17 @@ jobs:
       name: chrome
       addons:
         chrome: stable
-      script: npx aegir test -t browser
+      script:
+       - npm install ipfs go-ipfs-dep
+       - npx aegir test -t browser
 
     - stage: test
       name: firefox
       addons:
         firefox: latest
-      script: npx aegir test -t browser -- --browsers FirefoxHeadless
+      script:
+        - npm install ipfs go-ipfs-dep
+        - npx aegir test -t browser -- --browsers FirefoxHeadless
 
 notifications:
-  email: false
+  email: false

README.md

@@ -18,6 +18,16 @@ This repository will be used for interop tests. Please jump into the issues if y
 > git clone [email protected]:ipfs/interop.git
 > cd interop
 > npm install
+
+# install a version of js-ipfs to test with
+> npm install ipfs
+
+# optionally install a version of js-ipfs-http-client to test with
+# (otherwise the one ipfs depends on will be used)
+> npm install ipfs-http-client
+
+# install a version of go-ipfs to test with
+> npm install go-ipfs-dep
 ```
 
 ### Run the tests
@@ -29,15 +39,8 @@ This repository will be used for interop tests. Please jump into the issues if y
 ### Test with a non yet released version of js-ipfs
 
 ```
-# Do the steps in the install section, then
-> cd ..
-> git clone [email protected]:ipfs/js-ipfs.git
-> cd js-ipfs
-> npm install
-> npm link
-> cd ../interop
-> npm link ipfs
-> npm test
+# Do the steps in the install section but skip installing ipfs, then
+> IPFS_JS_EXEC=/path/to/js-ipfs/src/cli/bin.js IPFS_JS_MODULE=/path/to/js-ipfs npm test
 ```
 
 ### Test with a non yet released version of go-ipfs

package.json

@@ -48,10 +48,7 @@
     "delay": "^4.3.0",
     "detect-node": "^2.0.4",
     "dirty-chai": "^2.0.1",
-    "go-ipfs-dep": "~0.4.22",
     "hat": "~0.0.3",
-    "ipfs": "^0.39.0",
-    "ipfs-http-client": "^39.0.2",
     "ipfs-unixfs": "~0.1.16",
     "ipfsd-ctl": "~0.47.4",
     "ipns": "^0.6.1",
@@ -71,5 +68,10 @@
   "contributors": [],
   "devDependencies": {
     "karma-mocha-webworker": "^1.3.0"
+  },
+  "peerDependencies": {
+    "go-ipfs-dep": "~0.4.22",
+    "ipfs": "^0.39.0",
+    "ipfs-http-client": "^39.0.2"
   }
 }

test/utils/circuit.js

@@ -7,7 +7,13 @@ const { spawnGoDaemon, spawnJsDaemon } = require('./daemon')
 
 const crypto = require('crypto')
 
-const IPFS = require('ipfs')
+let IPFS
+
+if (process.env.IPFS_JS_MODULE) {
+  IPFS = require(process.env.IPFS_JS_MODULE)
+} else {
+  IPFS = require('ipfs')
+}
 
 const DaemonFactory = require('ipfsd-ctl')
 const procDf = DaemonFactory.create({ type: 'proc', exec: IPFS })