Merge pull request #16 from ipfs/update/latest-libp2p-ipfs

Update to latest libp2p-ipfs

package.json

@@ -34,13 +34,13 @@
   "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
   "devDependencies": {
     "abstract-blob-store": "^3.2.0",
-    "aegir": "^3.1.0",
+    "aegir": "^3.2.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "fs-blob-store": "^5.2.1",
     "idb-plus-blob-store": "^1.1.2",
     "ipfs-repo": "^0.8.0",
-    "libp2p-ipfs": "^0.9.0",
+    "libp2p-ipfs": "^0.10.0",
     "lodash": "^4.11.2",
     "multiaddr": "^2.0.2",
     "ncp": "^2.0.0",
@@ -63,4 +63,4 @@
     "David Dias <daviddias.p@gmail.com>",
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>"
   ]
-}
+}

src/network/index.js

@@ -22,15 +22,15 @@ module.exports = class Network {
     this._onPeerMux = this._onPeerMux.bind(this)
     this._onPeerMuxClosed = this._onPeerMuxClosed.bind(this)
 
-    this.libp2p.swarm.handle(PROTOCOL_IDENTIFIER, this._onConnection)
+    this.libp2p.handle(PROTOCOL_IDENTIFIER, this._onConnection)
 
     this.libp2p.swarm.on('peer-mux-established', this._onPeerMux)
 
     this.libp2p.swarm.on('peer-mux-closed', this._onPeerMuxClosed)
   }
 
   stop () {
-    this.libp2p.swarm.unhandle(PROTOCOL_IDENTIFIER)
+    this.libp2p.unhandle(PROTOCOL_IDENTIFIER)
     this.libp2p.swarm.removeEventListener('peer-mux-established', this._onPeerMux)
 
     this.libp2p.swarm.removeEventListener('peer-mux-closed', this._onPeerMuxClosed)
@@ -86,7 +86,7 @@ module.exports = class Network {
       return done(err)
     }
 
-    const conn = this.libp2p.swarm.dial(peerInfo, PROTOCOL_IDENTIFIER, (err) => {
+    this.libp2p.dialByPeerInfo(peerInfo, PROTOCOL_IDENTIFIER, (err, conn) => {
       if (err) {
         return done(err)
       }

test/index-test.js

@@ -16,8 +16,8 @@ const makeBlock = () => new Block(`hello world ${Math.random()}`)
 
 module.exports = (repo) => {
   const libp2pMock = {
+    handle: function () {},
     swarm: {
-      handle: function () {},
       muxedConns: {},
       on: function () {}
     }

test/network/network.node.js

@@ -12,7 +12,9 @@ const Block = require('ipfs-block')
 const Network = require('../../src/network')
 const Message = require('../../src/message')
 
-describe('network', () => {
+describe('network', function () {
+  this.timeout(15 * 1000)
+
   let libp2pNodeA
   let libp2pNodeB
   let peerInfoA
@@ -27,18 +29,21 @@ describe('network', () => {
     peerInfoA = new PeerInfo()
     peerInfoB = new PeerInfo()
 
-    peerInfoA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/10100'))
-    peerInfoB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/10500'))
+    peerInfoA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/10100/ipfs/' + peerInfoA.id.toB58String()))
+    console.log('peerA', peerInfoA.id.toB58String())
+
+    peerInfoB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/10500/ipfs/' + peerInfoB.id.toB58String()))
+    console.log('peerB', peerInfoB.id.toB58String())
 
     peerBookA = new PeerBook()
     peerBookB = new PeerBook()
 
     peerBookA.put(peerInfoB)
     peerBookB.put(peerInfoA)
 
-    libp2pNodeA = new libp2p.Node(peerInfoA)
+    libp2pNodeA = new libp2p.Node(peerInfoA, peerBookA)
     libp2pNodeA.start(started)
-    libp2pNodeB = new libp2p.Node(peerInfoB)
+    libp2pNodeB = new libp2p.Node(peerInfoB, peerBookB)
     libp2pNodeB.start(started)
 
     function started () {
@@ -50,8 +55,8 @@ describe('network', () => {
 
   after((done) => {
     let counter = 0
-    libp2pNodeA.swarm.close(stopped)
-    libp2pNodeB.swarm.close(stopped)
+    libp2pNodeA.stop(stopped)
+    libp2pNodeB.stop(stopped)
 
     function stopped () {
       if (++counter === 2) {
@@ -109,7 +114,7 @@ describe('network', () => {
       }
     }
 
-    libp2pNodeA.swarm.dial(peerInfoB, (err) => {
+    libp2pNodeA.dialByPeerInfo(peerInfoB, (err) => {
       expect(err).to.not.exist
     })
 
@@ -145,13 +150,12 @@ describe('network', () => {
       expect(err).to.not.exist
     }
 
-    const conn = libp2pNodeA.swarm.dial(peerInfoB, '/ipfs/bitswap/1.0.0', (err) => {
+    libp2pNodeA.dialByPeerInfo(peerInfoB, '/ipfs/bitswap/1.0.0', (err, conn) => {
+      const msgEncoded = msg.toProto()
+      conn.write(msgEncoded)
+      conn.end()
       expect(err).to.not.exist
     })
-
-    const msgEncoded = msg.toProto()
-    conn.write(msgEncoded)
-    conn.end()
   })
 
   it('sendMessage', (done) => {

test/utils.js

@@ -4,7 +4,7 @@ const async = require('async')
 const _ = require('lodash')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
-const PeerBook = require('peer-book')
+// const PeerBook = require('peer-book')
 const multiaddr = require('multiaddr')
 const Bitswap = require('../src')
 const libp2p = require('libp2p-ipfs')
@@ -100,8 +100,10 @@ exports.genBitswapNetwork = (n, callback) => {
   // create PeerInfo and libp2p.Node for each
   _.range(n).forEach((i) => {
     const p = new PeerInfo()
-    const mh1 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i))
-    const mh2 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i + 2000) + '/ws')
+    const mh1 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i) +
+        '/ipfs/' + p.id.toB58String())
+    const mh2 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i + 2000) + '/ws' +
+        '/ipfs/' + p.id.toB58String())
 
     p.multiaddr.add(mh1)
     p.multiaddr.add(mh2)
@@ -112,7 +114,7 @@ exports.genBitswapNetwork = (n, callback) => {
 
   // create PeerBook and populate peerBook
   netArray.forEach((net, i) => {
-    const pb = new PeerBook()
+    const pb = netArray[i].libp2p.peerBook
     netArray.forEach((net, j) => {
       if (i === j) {
         return
@@ -155,7 +157,7 @@ exports.genBitswapNetwork = (n, callback) => {
             to.peerInfo.id.toB58String()) {
           return cbJ()
         }
-        from.libp2p.swarm.dial(to.peerInfo, cbJ)
+        from.libp2p.dialByPeerInfo(to.peerInfo, cbJ)
       }, (err) => {
         if (err) {
           throw err