chore: use topology interface

Author: vasco-santos

package.json

@@ -37,7 +37,7 @@
     "it-length-prefixed": "^2.0.0",
     "it-pipe": "^1.0.1",
     "libp2p-floodsub": "libp2p/js-libp2p-floodsub#refactor/async",
-    "libp2p-pubsub": "libp2p/js-libp2p-pubsub#refactor/async",
+    "libp2p-pubsub": "~0.3.0",
     "p-map": "^3.0.0",
     "peer-id": "~0.13.3",
     "peer-info": "~0.17.0",

src/index.js

@@ -28,11 +28,6 @@ class GossipSub extends BasicPubsub {
   constructor (peerInfo, registrar, options = {}) {
     assert(PeerInfo.isPeerInfo(peerInfo), 'peer info must be an instance of `peer-info`')
 
-    // registrar handling
-    assert(registrar && typeof registrar.handle === 'function', 'a handle function must be provided in registrar')
-    assert(registrar && typeof registrar.register === 'function', 'a register function must be provided in registrar')
-    assert(registrar && typeof registrar.unregister === 'function', 'a unregister function must be provided in registrar')
-
     super({
       debugName: 'libp2p:gossipsub',
       multicodec: constants.GossipSubID,

src/pubsub.js

@@ -1,10 +1,6 @@
 'use strict'
 
 const assert = require('assert')
-const debug = require('debug')
-const debugName = 'libp2p:gossipsub'
-const log = debug(debugName)
-log.error = debug(`${debugName}:error`)
 const errcode = require('err-code')
 
 const TimeCache = require('time-cache')
@@ -76,6 +72,7 @@ class BasicPubSub extends Pubsub {
     this._options = _options
 
     this._onRpc = this._onRpc.bind(this)
+    this.log = this.log.bind(this)
   }
 
   /**
@@ -142,7 +139,7 @@ class BasicPubSub extends Pubsub {
       return
     }
 
-    log('rpc from', idB58Str)
+    this.log('rpc from', idB58Str)
     const subs = rpc.subscriptions
     const msgs = rpc.msgs
 
@@ -191,7 +188,7 @@ class BasicPubSub extends Pubsub {
         }
 
         if (error || !isValid) {
-          log('Message could not be validated, dropping it. isValid=%s', isValid, error)
+          this.log('Message could not be validated, dropping it. isValid=%s', isValid, error)
           return
         }
 
@@ -352,7 +349,7 @@ class BasicPubSub extends Pubsub {
   async publish (topics, messages) {
     assert(this.started, 'Pubsub has not started')
 
-    log('publish', topics, messages)
+    this.log('publish', topics, messages)
 
     topics = utils.ensureArray(topics)
     messages = utils.ensureArray(messages)

test/utils/index.js

@@ -117,13 +117,14 @@ const createMockRegistrar = (registrarRecord) => ({
       }
     })
   },
-  register: ({ multicodecs, handlers }) => {
+  register: ({ multicodecs, _onConnect, _onDisconnect }) => {
     multicodecs.forEach((multicodec) => {
       const rec = registrarRecord[multicodec] || {}
 
       registrarRecord[multicodec] = {
         ...rec,
-        ...handlers
+        onConnect: _onConnect,
+        onDisconnect: _onDisconnect
       }
     })
     return multicodecs[0]