fix: pubsub flag defaults

Author: vasco-santos

package.json

@@ -87,7 +87,7 @@
     "dirty-chai": "^2.0.1",
     "go-ipfs-dep": "~0.4.22",
     "husky": "^3.0.4",
-    "ipfs": "~0.37.1",
+    "ipfs": "ipfs/js-ipfs#feat/gossipsub-as-default-pubsub",
     "is-running": "^2.1.0",
     "lint-staged": "^9.2.5",
     "proxyquire": "^2.1.3",

src/ipfsd-in-proc.js

@@ -39,12 +39,15 @@ class InProc extends EventEmitter {
       pubsub: false,
       sharding: false
     })
+    this.opts.pubsub = defaultsDeep({}, opts.pubsub, {
+      enabled: false
+    })
 
     this.opts.args.forEach((arg) => {
       if (arg === '--enable-pubsub-experiment') {
         this.opts.EXPERIMENTAL.pubsub = true
       } else if (arg === '--enable-pubsub') {
-        this.opts.pubsub = true
+        this.opts.pubsub.enabled = true
       } else if (arg === '--enable-sharding-experiment') {
         this.opts.EXPERIMENTAL.sharding = true
       } else if (arg === '--enable-namesys-pubsub') {
@@ -68,6 +71,7 @@ class InProc extends EventEmitter {
       offline: this.opts.offline,
       EXPERIMENTAL: this.opts.EXPERIMENTAL,
       libp2p: this.opts.libp2p,
+      pubsub: this.opts.pubsub,
       config: this.opts.config,
       relay: this.opts.relay
     })

test/spawn-options.spec.js

@@ -314,7 +314,7 @@ describe('Spawn options', function () {
         this.timeout(20 * 1000)
 
         const options = {
-          args: ['--enable-pubsub-experiment'],
+          args: [fOpts.type !== 'go' ? '--enable-pubsub' : '--enable-pubsub-experiment'],
           initOptions: { bits: fOpts.bits, profile: 'test' }
         }