Merge pull request #685 from achingbrain/upgrade-to-js-ipfs-0.38.x-rc

Upgrade to js-IPFS v0.38.x-rc

package.json

@@ -43,7 +43,8 @@
     "datastore-level": "0.10.0",
     "fs-extra": "^7.0.1",
     "go-ipfs-dep": "aphelionz/npm-go-ipfs-dep",
-    "ipfs": "~0.36.4",
+    "ipfs": "0.38.0-rc.4",
+    "ipfs-http-client": "^37.0.1",
     "ipfs-repo": "~0.26.6",
     "ipfsd-ctl": "~0.42.3",
     "localstorage-level-migration": "next",

test/utils/config.js

@@ -3,9 +3,6 @@ module.exports = {
   dbname: 'orbit-db-tests',
   defaultIpfsConfig: {
     start: true,
-    EXPERIMENTAL: {
-      pubsub: true
-    },
     config: {
       Addresses: {
         API: '/ip4/127.0.0.1/tcp/0',
@@ -25,9 +22,6 @@ module.exports = {
     }
   },
   daemon1: {
-    EXPERIMENTAL: {
-      pubsub: true
-    },
     config: {
       Addresses: {
         API: '/ip4/127.0.0.1/tcp/0',
@@ -47,9 +41,6 @@ module.exports = {
     },
   },
   daemon2: {
-    EXPERIMENTAL: {
-      pubsub: true
-    },
     config: {
       Addresses: {
         API: '/ip4/127.0.0.1/tcp/0',

test/utils/start-ipfs.js

@@ -15,7 +15,7 @@ const startIpfs = (type, config = {}) => {
     }
 
     // If we're starting a process, pass command line arguments to it
-    if (!config.args) {
+    if (!config.args && type.includes('go')) {
       config.args = ['--enable-pubsub-experiment']
     }
 

test/utils/test-apis.js

@@ -1,4 +1,5 @@
 const IPFS = require('ipfs')
+const IPFSHTTPClient = require('ipfs-http-client')
 
 /**
  * IPFS daemons to run the tests with.
@@ -8,7 +9,7 @@ const IPFS = require('ipfs')
 // https://github.com/ipfs/js-ipfsd-ctl#ipfsfactory---const-f--ipfsfactorycreateoptions
 let jsIpfs = {
   'js-ipfs': {
-    type: 'proc', 
+    type: 'proc',
     exec: IPFS,
   }
 }
@@ -16,6 +17,7 @@ let jsIpfs = {
 const goIpfs = {
   'go-ipfs': {
     type: 'go',
+    IpfsClient: IPFSHTTPClient,
   }
 }