Things got fast (#148)

* chore: update deps

* fix(tests): the thing is so faster now, that tests were failing because of timing issues, fixed now

Author: daviddias

package.json

@@ -42,30 +42,30 @@
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
     "libp2p-multiplex": "^0.2.1",
-    "libp2p-secio": "^0.6.3",
+    "libp2p-secio": "^0.6.4",
     "libp2p-spdy": "^0.10.1",
     "libp2p-tcp": "^0.9.1",
     "libp2p-webrtc-star": "^0.7.0",
     "libp2p-websockets": "^0.9.1",
-    "pre-commit": "^1.1.3",
+    "pre-commit": "^1.2.2",
     "pull-goodbye": "0.0.1",
     "pull-stream": "^3.5.0",
     "webrtcsupport": "^2.2.0"
   },
   "dependencies": {
-    "async": "^2.1.2",
+    "async": "^2.1.4",
     "browserify-zlib": "github:ipfs/browserify-zlib",
-    "debug": "^2.4.0",
+    "debug": "^2.6.0",
     "interface-connection": "^0.3.0",
-    "ip-address": "^5.8.3",
+    "ip-address": "^5.8.6",
     "libp2p-identify": "^0.3.0",
     "lodash.includes": "^4.3.0",
     "multiaddr": "^2.1.1",
-    "multistream-select": "^0.13.0",
+    "multistream-select": "^0.13.2",
     "once": "^1.4.0",
     "peer-id": "^0.8.1",
-    "peer-info": "^0.8.1",
-    "protocol-buffers": "^3.1.8"
+    "peer-info": "^0.8.2",
+    "protocol-buffers": "^3.2.1"
   },
   "contributors": [
     "David Dias <[email protected]>",

test/browser-03-swarm-with-muxing-plus-webrtc-star.js

@@ -25,27 +25,21 @@ describe('high level API (swarm with spdy + webrtc-star)', () => {
   before((done) => {
     series([
       (cb) => peerId.create((err, id1) => {
-        if (err) {
-          return cb(err)
-        }
+        expect(err).to.not.exist
         peer1 = new PeerInfo(id1)
         const mh1 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id1.toB58String())
         peer1.multiaddr.add(mh1)
         cb()
       }),
       (cb) => peerId.create((err, id2) => {
-        if (err) {
-          return cb(err)
-        }
+        expect(err).to.not.exist
         peer2 = new PeerInfo(id2)
         const mh2 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id2.toB58String())
         peer2.multiaddr.add(mh2)
         cb()
       })
     ], (err) => {
-      if (err) {
-        return done(err)
-      }
+      expect(err).to.not.exist
 
       swarm1 = new Swarm(peer1)
       swarm2 = new Swarm(peer2)
@@ -106,44 +100,49 @@ describe('high level API (swarm with spdy + webrtc-star)', () => {
   })
 
   it('create a third node and check that discovery works', (done) => {
-    wstar1.discovery.on('peer', (peerInfo) => {
-      expect(Object.keys(swarm1.muxedConns).length).to.equal(1)
-      swarm1.dial(peerInfo, () => {
-        expect(Object.keys(swarm1.muxedConns).length).to.equal(2)
-      })
-    })
-    wstar2.discovery.on('peer', (peerInfo) => {
-      swarm2.dial(peerInfo)
-    })
+    let counter = 0
+
+    let swarm3
+
+    function check () {
+      if (++counter === 4) {
+        const s1n = Object.keys(swarm1.muxedConns).length
+        const s2n = Object.keys(swarm2.muxedConns).length
+        const s3n = Object.keys(swarm3.muxedConns).length
+        console.log('->', s1n, s2n, s3n)
+        expect(s1n).to.equal(2)
+        expect(s2n).to.equal(2)
+        expect(s3n).to.equal(2)
+        swarm3.close(done)
+      }
+      if (counter === 3) {
+        setTimeout(check, 2000)
+      }
+    }
+
+    wstar1.discovery.on('peer', (peerInfo) => swarm1.dial(peerInfo, check))
+    wstar2.discovery.on('peer', (peerInfo) => swarm2.dial(peerInfo, check))
 
     peerId.create((err, id3) => {
-      if (err) {
-        return done(err)
-      }
+      expect(err).to.not.exist
+
       const peer3 = new PeerInfo(id3)
       const mh3 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id3.toB58String())
       peer3.multiaddr.add(mh3)
 
-      const swarm3 = new Swarm(peer3)
+      swarm3 = new Swarm(peer3)
       const wstar3 = new WebRTCStar()
       swarm3.transport.add('wstar', wstar3)
       swarm3.connection.addStreamMuxer(spdy)
       swarm3.connection.reuse()
-      swarm3.listen(() => {
-        setTimeout(() => {
-          expect(Object.keys(swarm1.muxedConns).length).to.equal(2)
-          expect(Object.keys(swarm2.muxedConns).length).to.equal(2)
-          expect(Object.keys(swarm3.muxedConns).length).to.equal(2)
-          swarm3.close(done)
-        }, 8000)
-      })
+      swarm3.listen(check)
     })
   })
 
   it('close', (done) => {
     parallel([
-      swarm1.close,
-      swarm2.close
+      (cb) => swarm1.close(cb),
+      (cb) => swarm2.close(cb)
     ], done)
   })
 })