chore: remove _pubsub

package.json

@@ -73,7 +73,7 @@
     "libp2p-delegated-content-routing": "^0.2.2",
     "libp2p-delegated-peer-routing": "^0.2.2",
     "libp2p-floodsub": "~0.17.0",
-    "libp2p-gossipsub": "ChainSafe/gossipsub-js#master",
+    "libp2p-gossipsub": "~0.0.3",
     "libp2p-kad-dht": "^0.15.2",
     "libp2p-mdns": "^0.12.3",
     "libp2p-mplex": "^0.8.4",

src/index.js

@@ -123,10 +123,7 @@ class Libp2p extends EventEmitter {
 
     // start pubsub
     if (this._config.pubsub.enabled) {
-      const Pubsub = this._modules.pubsub
-
-      this._pubsub = new Pubsub(this)
-      this.pubsub = pubsub(this)
+      this.pubsub = pubsub(this, this._modules.pubsub)
     }
 
     // Attach remaining APIs
@@ -398,8 +395,8 @@ class Libp2p extends EventEmitter {
         }
       },
       (cb) => {
-        if (this._pubsub) {
-          return this._pubsub.start(cb)
+        if (this.pubsub) {
+          return this.pubsub.start(cb)
         }
         cb()
       },
@@ -437,8 +434,8 @@ class Libp2p extends EventEmitter {
         )
       },
       (cb) => {
-        if (this._pubsub) {
-          return this._pubsub.stop(cb)
+        if (this.pubsub) {
+          return this.pubsub.stop(cb)
         }
         cb()
       },

src/pubsub.js

@@ -5,8 +5,8 @@ const { messages, codes } = require('./errors')
 
 const errCode = require('err-code')
 
-module.exports = (node) => {
-  const pubsub = node._pubsub
+module.exports = (node, Pubsub) => {
+  const pubsub = new Pubsub(node)
 
   return {
     subscribe: (topic, options, handler, callback) => {
@@ -94,6 +94,10 @@ module.exports = (node) => {
 
     setMaxListeners (n) {
       return pubsub.setMaxListeners(n)
-    }
+    },
+
+    start: (cb) => pubsub.start(cb),
+
+    stop: (cb) => pubsub.stop(cb)
   }
 }

test/create.spec.js

@@ -32,7 +32,7 @@ describe('libp2p creation', () => {
       let sw = node._switch
       let cm = node.connectionManager
       let dht = node._dht
-      let pub = node._pubsub
+      let pub = node.pubsub
 
       sinon.spy(sw, 'start')
       sinon.spy(cm, 'start')