PubSub Interop Tests and CLI+HTTP-API Implementation

src/core/components/no-floodsub.js

@@ -0,0 +1,25 @@
+'use strict'
+
+const EventEmitter = require('events')
+
+function fail() {
+  throw new Error('The daemon must be run with \'--enable-pubsub-experiment\'')
+}
+
+class NoFloodSub extends EventEmitter {
+  constructor () {
+    super()
+
+    this.peers = new Map()
+    this.subscriptions = new Set()
+  }
+
+  start (callback) { callback() }
+  stop (callback) { callback() }
+  publish () { fail() }
+  subscribe () { fail() }
+  unsubscribe () { fail() }
+
+}
+
+module.exports = NoFloodSub

src/core/components/start.js

@@ -3,6 +3,7 @@
 const series = require('async/series')
 const Bitswap = require('ipfs-bitswap')
 const FloodSub = require('libp2p-floodsub')
+const NoFloodSub = require('./no-floodsub')
 const setImmediate = require('async/setImmediate')
 const promisify = require('promisify-es6')
 
@@ -50,12 +51,10 @@ module.exports = (self) => {
       self._bitswap.start()
       self._blockService.setExchange(self._bitswap)
 
-      if (self._options.EXPERIMENTAL.pubsub) {
-        self._pubsub = new FloodSub(self._libp2pNode)
-        self._pubsub.start(done)
-      } else {
-        done()
-      }
+      self._pubsub = self._options.EXPERIMENTAL.pubsub
+        ? new FloodSub(self._libp2pNode)
+        : new NoFloodSub()
+      self._pubsub.start(done)
     })
   })
 }

src/core/components/stop.js

@@ -31,13 +31,7 @@ module.exports = (self) => {
     self._bitswap.stop()
 
     series([
-      (cb) => {
-        if (self._options.EXPERIMENTAL.pubsub) {
-          self._pubsub.stop(cb)
-        } else {
-          cb()
-        }
-      },
+      (cb) => self._pubsub.stop(cb),
       (cb) => self.libp2p.stop(cb),
       (cb) => self._repo.close(cb)
     ], done)

test/cli/pubsub.js

@@ -14,7 +14,7 @@ const createTempNode = ''
 const repoPath = require('./index').repoPath
 const ipfs = require('../utils/ipfs-exec')(repoPath)
 
-describe.skip('pubsub', () => {
+describe('pubsub', () => {
   const topicA = 'nonscentsA'
   const topicB = 'nonscentsB'
   const topicC = 'nonscentsC'

test/http-api/interface/pubsub.js

@@ -2,8 +2,6 @@
 
 'use strict'
 
-// TODO needs: https://github.com/ipfs/js-ipfs-api/pull/493
-/*
 const test = require('interface-ipfs-core')
 const FactoryClient = require('./../../utils/ipfs-factory-daemon')
 
@@ -20,4 +18,3 @@ const common = {
 }
 
 test.pubsub(common)
-*/

test/http-api/spec/pubsub.js

@@ -10,7 +10,7 @@ const createTempNode = ''
 
 // TODO migrate to use ipfs-factory-daemon
 module.exports = (http) => {
-  describe.skip('/pubsub', () => {
+  describe('/pubsub', () => {
     let api
     let tmpNode
 

test/utils/ipfs-factory-daemon/index.js

@@ -52,7 +52,9 @@ class Factory {
         })
       },
       (cb) => {
-        daemon = new HttpApi(repoPath, config)
+        daemon = new HttpApi(repoPath, config, { 
+          enablePubsubExperiment: true,
+        })
         daemon.repoPath = repoPath
         this.daemonsSpawned.push(daemon)