chore: use topology interface

libp2p · Nov 14, 2019 · b48661e · b48661e
1 parent cdfd023
commit b48661e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 181 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "it-protocol-buffers": "^0.2.0",
     "latency-monitor": "~0.2.1",
     "libp2p-crypto": "^0.17.1",
-    "libp2p-interfaces": "^0.1.3",
+    "libp2p-interfaces": "^0.1.4",
     "mafmt": "^7.0.0",
     "merge-options": "^1.0.1",
     "moving-average": "^1.0.0",

diff --git a/src/connection-manager/topology.js b/src/connection-manager/topology.js
diff --git a/src/registrar.js b/src/registrar.js
@@ -7,7 +7,6 @@ log.error = debug('libp2p:peer-store:error')
 
 const { Connection } = require('libp2p-interfaces/src/connection')
 const PeerInfo = require('peer-info')
-const Toplogy = require('./connection-manager/topology')
 
 /**
  * Responsible for notifying registered protocols of events in the network.
@@ -106,17 +105,12 @@ class Registrar {
 
   /**
    * Register handlers for a set of multicodecs given
-   * @param {Object} topologyProps properties for topology
-   * @param {Array<string>|string} topologyProps.multicodecs
-   * @param {Object} topologyProps.handlers
-   * @param {function} topologyProps.handlers.onConnect
-   * @param {function} topologyProps.handlers.onDisconnect
+   * @param {Topology} topology protocol topology
    * @return {string} registrar identifier
    */
-  register (topologyProps) {
-    // Create multicodec topology
+  register (topology) {
+    // Create topology
     const id = (parseInt(Math.random() * 1e9)).toString(36) + Date.now()
-    const topology = new Toplogy(topologyProps)
 
     this.topologies.set(id, topology)
 

diff --git a/test/registrar/registrar.spec.js b/test/registrar/registrar.spec.js
@@ -7,6 +7,7 @@ const { expect } = chai
 const pDefer = require('p-defer')
 
 const PeerInfo = require('peer-info')
+const Topology = require('libp2p-interfaces/src/topology')
 const PeerStore = require('../../src/peer-store')
 const Registrar = require('../../src/registrar')
 const { createMockConnection } = require('./utils')
@@ -32,53 +33,7 @@ describe('registrar', () => {
       throw new Error('should fail to register a protocol if no multicodec is provided')
     })
 
-    it('should fail to register a protocol if no handlers are provided', () => {
-      const topologyProps = {
-        multicodecs: multicodec
-      }
-
-      try {
-        registrar.register(topologyProps)
-      } catch (err) {
-        expect(err).to.exist()
-        return
-      }
-      throw new Error('should fail to register a protocol if no handlers are provided')
-    })
-
-    it('should fail to register a protocol if the onConnect handler is not provided', () => {
-      const topologyProps = {
-        multicodecs: multicodec,
-        handlers: {
-          onDisconnect: () => { }
-        }
-      }
-
-      try {
-        registrar.register(topologyProps)
-      } catch (err) {
-        expect(err).to.exist()
-        return
-      }
-      throw new Error('should fail to register a protocol if the onConnect handler is not provided')
-    })
-
-    it('should fail to register a protocol if the onDisconnect handler is not provided', () => {
-      const topologyProps = {
-        multicodecs: multicodec,
-        handlers: {
-          onConnect: () => { }
-        }
-      }
-
-      try {
-        registrar.register(topologyProps)
-      } catch (err) {
-        expect(err).to.exist()
-        return
-      }
-      throw new Error('should fail to register a protocol if the onDisconnect handler is not provided')
-    })
+    // TODO: not valid topology
   })
 
   describe('registration', () => {
@@ -88,27 +43,27 @@ describe('registrar', () => {
     })
 
     it('should be able to register a protocol', () => {
-      const topologyProps = {
+      const topologyProps = new Topology({
+        multicodecs: multicodec,
         handlers: {
           onConnect: () => { },
           onDisconnect: () => { }
-        },
-        multicodecs: multicodec
-      }
+        }
+      })
 
       const identifier = registrar.register(topologyProps)
 
       expect(identifier).to.exist()
     })
 
     it('should be able to unregister a protocol', () => {
-      const topologyProps = {
+      const topologyProps = new Topology({
+        multicodecs: multicodec,
         handlers: {
           onConnect: () => { },
           onDisconnect: () => { }
-        },
-        multicodecs: multicodec
-      }
+        }
+      })
 
       const identifier = registrar.register(topologyProps)
       const success = registrar.unregister(identifier)
@@ -138,7 +93,7 @@ describe('registrar', () => {
       registrar.onConnect(remotePeerInfo, conn)
       expect(registrar.connections.size).to.eql(1)
 
-      const topologyProps = {
+      const topologyProps = new Topology({
         multicodecs: multicodec,
         handlers: {
           onConnect: (peerInfo, connection) => {
@@ -153,19 +108,17 @@ describe('registrar', () => {
             onDisconnectDefer.resolve()
           }
         }
-      }
+      })
 
       // Register protocol
       const identifier = registrar.register(topologyProps)
       const topology = registrar.topologies.get(identifier)
 
       // Topology created
       expect(topology).to.exist()
-      expect(topology.peers.size).to.eql(1)
 
       registrar.onDisconnect(remotePeerInfo)
       expect(registrar.connections.size).to.eql(0)
-      expect(topology.peers.size).to.eql(1) // topology should keep the peer
 
       // Wait for handlers to be called
       return Promise.all([
@@ -178,7 +131,7 @@ describe('registrar', () => {
       const onConnectDefer = pDefer()
       const onDisconnectDefer = pDefer()
 
-      const topologyProps = {
+      const topologyProps = new Topology({
         multicodecs: multicodec,
         handlers: {
           onConnect: () => {
@@ -188,15 +141,14 @@ describe('registrar', () => {
             onDisconnectDefer.resolve()
           }
         }
-      }
+      })
 
       // Register protocol
       const identifier = registrar.register(topologyProps)
       const topology = registrar.topologies.get(identifier)
 
       // Topology created
       expect(topology).to.exist()
-      expect(topology.peers.size).to.eql(0)
       expect(registrar.connections.size).to.eql(0)
 
       // Setup connections before registrar
@@ -212,7 +164,6 @@ describe('registrar', () => {
       peerStore.put(peerInfo)
 
       await onConnectDefer.promise
-      expect(topology.peers.size).to.eql(1)
 
       // Remove protocol to peer and update it
       peerInfo.protocols.delete(multicodec)