chore: update dependencies and fix libp2p test usage (#64)

Author: jacobheun

.travis.yml

@@ -57,7 +57,7 @@ map([0, 1], (i, cb) => {
 
     suite
       .on('cycle', (event) => {
-        console.log(String(event.target))
+        console.log(String(event.target)) // eslint-disable-line
       })
       .on('complete', () => {
         process.exit()

appveyor.yml

@@ -19,7 +19,7 @@ suite.add('randomSeqno', () => {
 
 suite
   .on('cycle', (event) => {
-    console.log(String(event.target))
+    console.log(String(event.target)) // eslint-disable-line
     res = []
   })
   .run({

benchmarks/index.js

@@ -18,8 +18,7 @@
     "coverage-publish": "aegir coverage --provider coveralls"
   },
   "pre-push": [
-    "lint",
-    "test"
+    "lint"
   ],
   "repository": {
     "type": "git",
@@ -39,24 +38,24 @@
   },
   "homepage": "https://github.com/libp2p/js-libp2p-floodsub#readme",
   "devDependencies": {
-    "aegir": "^13.0.6",
+    "aegir": "^17.1.1",
     "benchmark": "^2.1.4",
-    "chai": "^4.1.2",
+    "chai": "^4.2.0",
     "dirty-chai": "^2.0.1",
-    "libp2p": "~0.19.2",
-    "libp2p-secio": "~0.10.0",
-    "libp2p-spdy": "~0.12.1",
-    "libp2p-tcp": "~0.12.0",
-    "peer-id": "~0.10.7",
-    "peer-info": "~0.14.0"
+    "libp2p": "~0.24.1",
+    "libp2p-secio": "~0.10.1",
+    "libp2p-spdy": "~0.13.1",
+    "libp2p-tcp": "~0.13.0",
+    "peer-id": "~0.12.0",
+    "peer-info": "~0.15.0"
   },
   "dependencies": {
-    "async": "^2.6.0",
+    "async": "^2.6.1",
     "bs58": "^4.0.1",
-    "debug": "^3.1.0",
-    "length-prefixed-stream": "^1.5.2",
-    "libp2p-crypto": "~0.13.0",
-    "lodash": "^4.3.0",
+    "debug": "^4.1.0",
+    "length-prefixed-stream": "^1.6.0",
+    "libp2p-crypto": "~0.14.1",
+    "lodash": "^4.17.11",
     "protons": "^1.0.1",
     "pull-pushable": "^2.2.0",
     "time-cache": "~0.3.0"

benchmarks/utils.js

@@ -20,7 +20,7 @@ class BaseProtocol extends EventEmitter {
    * @param {String} debugName
    * @param {String} multicodec
    * @param {Object} libp2p
-   * @returns {FloodSub}
+   * @constructor
    */
   constructor (debugName, multicodec, libp2p) {
     super()

circle.yml

@@ -22,7 +22,7 @@ const setImmediate = require('async/setImmediate')
 class FloodSub extends BaseProtocol {
   /**
    * @param {Object} libp2p
-   * @returns {FloodSub}
+   * @constructor
    */
   constructor (libp2p) {
     super('libp2p:floodsub', multicodec, libp2p)

package.json

@@ -14,7 +14,6 @@ const utils = require('./utils')
 const first = utils.first
 const createNode = utils.createNode
 const expectSet = utils.expectSet
-const Buffer = require('safe-buffer').Buffer
 
 describe('basics between 2 nodes', () => {
   describe('fresh nodes', () => {
@@ -97,7 +96,7 @@ describe('basics between 2 nodes', () => {
 
       fsB.once('Z', shouldNotHappen)
 
-      fsA.publish('Z', new Buffer('hey'))
+      fsA.publish('Z', Buffer.from('hey'))
     })
 
     it('Publish to a topic:Z in nodeB', (done) => {
@@ -114,7 +113,7 @@ describe('basics between 2 nodes', () => {
 
       fsB.once('Z', shouldNotHappen)
 
-      fsB.publish('Z', new Buffer('banana'))
+      fsB.publish('Z', Buffer.from('banana'))
     })
 
     it('Publish 10 msg to a topic:Z in nodeB', (done) => {
@@ -137,7 +136,7 @@ describe('basics between 2 nodes', () => {
         }
       }
 
-      times(10, () => fsB.publish('Z', new Buffer('banana')))
+      times(10, () => fsB.publish('Z', Buffer.from('banana')))
     })
 
     it('Publish 10 msg to a topic:Z in nodeB as array', (done) => {
@@ -161,7 +160,7 @@ describe('basics between 2 nodes', () => {
       }
 
       let msgs = []
-      times(10, () => msgs.push(new Buffer('banana')))
+      times(10, () => msgs.push(Buffer.from('banana')))
       fsB.publish('Z', msgs)
     })
 
@@ -189,8 +188,8 @@ describe('basics between 2 nodes', () => {
         done()
       }, 100)
 
-      fsB.publish('Z', new Buffer('banana'))
-      fsA.publish('Z', new Buffer('banana'))
+      fsB.publish('Z', Buffer.from('banana'))
+      fsA.publish('Z', Buffer.from('banana'))
     })
 
     it('stop both FloodSubs', (done) => {
@@ -208,10 +207,12 @@ describe('basics between 2 nodes', () => {
     let fsB
 
     before((done) => {
-      series([
+      parallel([
         (cb) => createNode('/ip4/127.0.0.1/tcp/0', cb),
         (cb) => createNode('/ip4/127.0.0.1/tcp/0', cb)
-      ], (cb, nodes) => {
+      ], (err, nodes) => {
+        expect(err).to.not.exist()
+
         nodeA = nodes[0]
         nodeB = nodes[1]
 

src/base.js

@@ -6,18 +6,18 @@ const secio = require('libp2p-secio')
 const libp2p = require('libp2p')
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
-    options = options || {}
-
+  constructor ({ peerInfo, peerBook }) {
     const modules = {
-      transport: [new TCP()],
-      connection: {
-        muxer: spdy,
-        crypto: [ secio ]
-      }
+      transport: [TCP],
+      streamMuxer: [spdy],
+      connEncryption: [secio]
     }
 
-    super(modules, peerInfo, peerBook, options)
+    super({
+      modules,
+      peerInfo,
+      peerBook
+    })
   }
 }
 

src/index.js

@@ -16,9 +16,9 @@ exports.createNode = (maddr, callback) => {
   waterfall([
     (cb) => PeerId.create({ bits: 1024 }, cb),
     (id, cb) => PeerInfo.create(id, cb),
-    (peer, cb) => {
-      peer.multiaddrs.add(maddr)
-      cb(null, new Node(peer))
+    (peerInfo, cb) => {
+      peerInfo.multiaddrs.add(maddr)
+      cb(null, new Node({ peerInfo }))
     },
     (node, cb) => node.start((err) => cb(err, node))
   ], callback)