fix: remove unneeded peerbook puts (#348)

test/peer-discovery.node.js

@@ -9,15 +9,13 @@ const signalling = require('libp2p-webrtc-star/src/sig-server')
 const parallel = require('async/parallel')
 const crypto = require('crypto')
 
-const PeerId = require('peer-id')
-const PeerInfo = require('peer-info')
-
 const createNode = require('./utils/create-node')
 const echo = require('./utils/echo')
 
 describe('peer discovery', () => {
   let nodeA
   let nodeB
+  let nodeC
   let port = 24642
   let ss
 
@@ -49,6 +47,15 @@ describe('peer discovery', () => {
           nodeB = node
           node.handle('/echo/1.0.0', echo)
           node.start(cb)
+        }),
+        (cb) => createNode([
+          '/ip4/0.0.0.0/tcp/0',
+          `/ip4/127.0.0.1/tcp/${port}/ws/p2p-webrtc-star`
+        ], options, (err, node) => {
+          expect(err).to.not.exist()
+          nodeC = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
         })
       ], done)
     })
@@ -57,6 +64,7 @@ describe('peer discovery', () => {
       parallel([
         (cb) => nodeA.stop(cb),
         (cb) => nodeB.stop(cb),
+        (cb) => nodeC.stop(cb),
         (cb) => ss.stop(cb)
       ], done)
     })
@@ -250,6 +258,7 @@ describe('peer discovery', () => {
         peerDiscovery: {
           mdns: {
             enabled: true,
+            interval: 1e3, // discover quickly
             // use a random tag to prevent CI collision
             serviceTag: crypto.randomBytes(10).toString('hex')
           }
@@ -257,13 +266,23 @@ describe('peer discovery', () => {
       }
     })
 
-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
+    it('find peers', function (done) {
+      let expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])
 
-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
         done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
       })
     })
   })
@@ -283,12 +302,24 @@ describe('peer discovery', () => {
       }
     })
 
-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+    it('find peers', function (done) {
+      this.timeout(20e3)
+      let expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])
+
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
         done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
       })
     })
   })
@@ -302,6 +333,7 @@ describe('peer discovery', () => {
         peerDiscovery: {
           mdns: {
             enabled: true,
+            interval: 1e3, // discovery quickly
             // use a random tag to prevent CI collision
             serviceTag: crypto.randomBytes(10).toString('hex')
           },
@@ -312,12 +344,23 @@ describe('peer discovery', () => {
       }
     })
 
-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+    it('find peers', function (done) {
+      let expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])
+
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
         done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
       })
     })
   })
@@ -332,24 +375,46 @@ describe('peer discovery', () => {
           webRTCStar: {
             enabled: false
           }
+        },
+        dht: {
+          enabled: true,
+          kBucketSize: 20,
+          randomWalk: {
+            enabled: true,
+            queriesPerPeriod: 1,
+            interval: 1000, // start the query sooner
+            timeout: 3000
+          }
         }
       }
     })
 
-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
+    it('find peers through the dht', function (done) {
+      let expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])
 
-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
         done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
       })
 
-      // connect two dhts
-      const publicPeerId = new PeerId(nodeB._dht.peerInfo.id.id, null, nodeB._dht.peerInfo.id.pubKey)
-      const target = new PeerInfo(publicPeerId)
-      target.multiaddrs = nodeB._dht.peerInfo.multiaddrs
-      nodeA._dht.switch.dial(target, (err) => {
+      // Topology:
+      // A -> B
+      // C -> B
+      nodeA.dial(nodeB.peerInfo, (err) => {
+        expect(err).to.not.exist()
+      })
+      nodeC.dial(nodeB.peerInfo, (err) => {
         expect(err).to.not.exist()
       })
     })