chore: add config for pubsub router

ipfs · Jul 24, 2019 · 63cd538 · 63cd538
1 parent 5f20a68
commit 63cd538
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 11 deletions.
diff --git a/src/core/components/libp2p.js b/src/core/components/libp2p.js
@@ -64,7 +64,9 @@ function defaultBundle ({ datastore, peerInfo, peerBook, options, config }) {
     peerBook,
     modules: {
       contentRouting,
-      peerRouting
+      peerRouting,
+      pubsub: get(config, 'Pubsub.Router', 'gossipsub') === 'floodsub'
+        ? require('libp2p-floodsub') : require('libp2p-gossipsub')
     },
     config: {
       peerDiscovery: {

diff --git a/src/core/config.js b/src/core/config.js
@@ -68,6 +68,9 @@ const configSchema = s({
       }))
     })),
     Bootstrap: optional(s(['multiaddr-ipfs'])),
+    Pubsub: optional(s({
+      Router: 'string?'
+    })),
     Swarm: optional(s({
       ConnMgr: optional(s({
         LowWater: 'number?',

diff --git a/src/core/runtime/config-browser.js b/src/core/runtime/config-browser.js
@@ -27,6 +27,9 @@ module.exports = () => ({
     '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic',
     '/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6'
   ],
+  Pubsub: {
+    Router: 'gossipsub'
+  },
   Swarm: {
     ConnMgr: {
       LowWater: 200,

diff --git a/src/core/runtime/config-nodejs.js b/src/core/runtime/config-nodejs.js
@@ -40,6 +40,9 @@ module.exports = () => ({
     '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic',
     '/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6'
   ],
+  Pubsub: {
+    Router: 'gossipsub'
+  },
   Swarm: {
     ConnMgr: {
       LowWater: 200,

diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js
@@ -16,13 +16,6 @@ describe('interface-ipfs-core tests', function () {
 
   tests.bootstrap(defaultCommonFactory)
 
-  tests.config(defaultCommonFactory, {
-    skip: [{
-      name: 'should set a number',
-      reason: 'Failing - needs to be fixed'
-    }]
-  })
-
   tests.config(defaultCommonFactory, {
     skip: [
       {

diff --git a/test/core/libp2p.spec.js b/test/core/libp2p.spec.js
@@ -44,9 +44,6 @@ describe('libp2p customization', function () {
         webRTCStar: {
           Enabled: false
         }
-      },
-      pubsub: {
-        enabled: false
       }
     }
     datastore = new MemoryStore()
@@ -290,4 +287,60 @@ describe('libp2p customization', function () {
       })
     })
   })
+
+  describe('bundle via custom config for pubsub', () => {
+    it('select gossipsub as pubsub router', (done) => {
+      const ipfs = {
+        _repo: {
+          datastore
+        },
+        _peerInfo: peerInfo,
+        _peerBook: peerBook,
+        // eslint-disable-next-line no-console
+        _print: console.log,
+        _options: {}
+      }
+      const customConfig = {
+        ...testConfig,
+        Pubsub: {
+          Router: 'gossipsub'
+        }
+      }
+
+      _libp2p = libp2pComponent(ipfs, customConfig)
+
+      _libp2p.start((err) => {
+        expect(err).to.not.exist()
+        expect(_libp2p._modules.pubsub).to.eql(require('libp2p-gossipsub'))
+        done()
+      })
+    })
+
+    it('select floodsub as pubsub router', (done) => {
+      const ipfs = {
+        _repo: {
+          datastore
+        },
+        _peerInfo: peerInfo,
+        _peerBook: peerBook,
+        // eslint-disable-next-line no-console
+        _print: console.log,
+        _options: {}
+      }
+      const customConfig = {
+        ...testConfig,
+        Pubsub: {
+          Router: 'floodsub'
+        }
+      }
+
+      _libp2p = libp2pComponent(ipfs, customConfig)
+
+      _libp2p.start((err) => {
+        expect(err).to.not.exist()
+        expect(_libp2p._modules.pubsub).to.eql(require('libp2p-floodsub'))
+        done()
+      })
+    })
+  })
 })