Merge pull request #682 from ipfs/feat/update-bitswap

Use new bitswap

Author: daviddias

package.json

@@ -22,9 +22,9 @@
     "coverage": "gulp coverage",
     "test": "gulp test",
     "test:unit:node": "gulp test:node",
-    "test:unit:node:core": "TEST=core npm run test:node",
-    "test:unit:node:http": "TEST=http npm run test:node",
-    "test:unit:node:cli": "TEST=cli npm run test:node",
+    "test:unit:node:core": "TEST=core npm run test:unit:node",
+    "test:unit:node:http": "TEST=http npm run test:unit:node",
+    "test:unit:node:cli": "TEST=cli npm run test:unit:node",
     "test:unit:browser": "gulp test:browser",
     "test:interop": "mocha -t 60000 test/interop",
     "test:interop:node": "mocha -t 60000 test/interop/node.js",
@@ -92,9 +92,9 @@
     "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
     "ipfs-api": "^12.1.2",
-    "ipfs-bitswap": "^0.8.3",
+    "ipfs-bitswap": "^0.9.0",
     "ipfs-block": "^0.5.4",
-    "ipfs-block-service": "^0.7.2",
+    "ipfs-block-service": "^0.8.0",
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.11.2",
     "ipfs-unixfs": "^0.1.9",

src/cli/commands/bitswap/stat.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const utils = require('../../utils')
+const CID = require('cids')
 
 module.exports = {
   command: 'stat',
@@ -21,6 +22,11 @@ module.exports = {
         }
 
         stats.Wantlist = stats.Wantlist || []
+        stats.Wantlist = stats.Wantlist.map((entry) => {
+          const buf = new Buffer(entry.cid.hash.data)
+          const cid = new CID(entry.cid.version, entry.cid.codec, buf)
+          return cid.toBaseEncodedString()
+        })
         stats.Peers = stats.Peers || []
 
         console.log(`bitswap status

src/cli/commands/bitswap/wantlist.js

@@ -26,7 +26,9 @@ module.exports = {
         if (err) {
           throw err
         }
-        res.Keys.forEach((k) => console.log(k))
+        res.Keys.forEach((cidStr) => {
+          console.log(cidStr)
+        })
       })
     })
   }

src/core/components/bitswap.js

@@ -3,7 +3,7 @@
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
 function formatWantlist (list) {
-  return Array.from(list).map((e) => e[0])
+  return Array.from(list).map((e) => e[1])
 }
 
 module.exports = function bitswap (self) {

src/core/components/go-online.js

@@ -14,7 +14,6 @@ module.exports = function goOnline (self) {
       }
 
       self._bitswap = new Bitswap(
-        {}, // TODO remove when new bitswap is merged
         self._libp2pNode,
         self._repo.blockstore,
         self._libp2pNode.peerBook

src/http-api/resources/bitswap.js

@@ -10,6 +10,7 @@ exports.wantlist = (request, reply) => {
   let list
   try {
     list = request.server.app.ipfs.bitswap.wantlist()
+    list = list.map((entry) => entry.cid.toBaseEncodedString())
   } catch (err) {
     return reply(boom.badRequest(err))
   }