Upgrade to use latest libp2p modules

.travis.yml

@@ -1,8 +1,15 @@
 sudo: false
 language: node_js
-node_js:
-  - 4
-  - 5
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
@@ -13,12 +20,17 @@ script:
   - npm test
   - npm run coverage
 
-addons:
-  firefox: 'latest'
-
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 after_success:
   - npm run coverage-publish
+
+addons:
+  firefox: 'latest'
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8

package.json

@@ -28,17 +28,17 @@
   },
   "homepage": "https://github.com/diasdavid/js-ipfs-railing",
   "devDependencies": {
-    "aegir": "^9.1.1",
+    "aegir": "^9.1.2",
     "chai": "^3.5.0",
-    "libp2p-swarm": "^0.26.0",
-    "libp2p-tcp": "^0.9.0",
+    "libp2p-swarm": "^0.26.2",
+    "libp2p-tcp": "^0.9.1",
     "pre-commit": "^1.1.2"
   },
   "dependencies": {
-    "ipfs-logger": "^0.1.0",
+    "ipfs-logger": "^0.1.1",
     "peer-info": "^0.8.0",
-    "peer-id": "^0.3.0",
-    "multiaddr": "^2.0.3"
+    "peer-id": "^0.8.0",
+    "multiaddr": "^2.1.1"
   },
   "jsnext:main": "src/index.js",
   "pre-commit": [

src/index.js

@@ -5,6 +5,7 @@ var Peer = require('peer-info')
 var multiaddr = require('multiaddr')
 var EventEmitter = require('events').EventEmitter
 var util = require('util')
+var log = require('ipfs-logger').group('bootstrap ipfs-railing')
 
 exports = module.exports = Bootstrap
 exports.default = require('./default.json')
@@ -23,18 +24,24 @@ function Bootstrap (peerList, options, swarm) {
       var mh = multiaddr(peerCandidate.split('/').splice(0, 5).join('/'))
       var peerId = Id.createFromB58String(peerCandidate.split('/').splice(6)[0])
 
-      var p = new Peer(peerId, [mh])
-
-      if (options && options.verify) {
-        swarm.dial(p, {}, function (err) {
-          if (err) {
-            return
-          }
-          self.emit('peer', p)
-        })
-      } else {
-        self.emit('peer', p)
-      }
+      Peer.create(peerId, function (err, peer) {
+        if (err) {
+          return log.warn('Error creating PeerInfo from bootstrap peer', err)
+        }
+
+        peer.multiaddr.add(mh)
+
+        if (options && options.verify) {
+          swarm.dial(peer, function (err) {
+            if (err) {
+              return
+            }
+            self.emit('peer', peer)
+          })
+        } else {
+          self.emit('peer', peer)
+        }
+      })
     })
   })
 }

test/verify-on.spec.js

@@ -2,10 +2,9 @@
 'use strict'
 
 var multiaddr = require('multiaddr')
-var Id = require('peer-id')
 var Peer = require('peer-info')
 var Swarm = require('libp2p-swarm')
-var tcp = require('libp2p-tcp')
+var TCP = require('libp2p-tcp')
 
 var Broadcast = require('./../src')
 
@@ -17,14 +16,35 @@ var swB
 describe('With verify on', function () {
   before(function (done) {
     var mh1 = multiaddr('/ip4/127.0.0.1/tcp/8010')
-    pA = new Peer(Id.create(), [])
-    swA = new Swarm(pA)
-    swA.addTransport('tcp', tcp, { multiaddr: mh1 }, {}, {port: 8010}, ready)
-
     var mh2 = multiaddr('/ip4/127.0.0.1/tcp/8020')
-    pB = new Peer(Id.create(), [])
-    swB = new Swarm(pB)
-    swB.addTransport('tcp', tcp, { multiaddr: mh2 }, {}, {port: 8020}, ready)
+
+    Peer.create(function (err, peer) {
+      if (err) {
+        done(err)
+      }
+
+      pA = peer
+      pA.multiaddr.add(mh1)
+
+      swA = new Swarm(pA)
+      swA.transport.add('tcp', new TCP(), {}, function () {
+        swA.listen(ready)
+      })
+    })
+
+    Peer.create(function (err, peer) {
+      if (err) {
+        done(err)
+      }
+
+      pB = peer
+      pB.multiaddr.add(mh2)
+
+      swB = new Swarm(pB)
+      swB.transport.add('tcp', new TCP(), {}, function () {
+        swB.listen(ready)
+      })
+    })
 
     var readyCounter = 0