Merge pull request #309 from ipfs/greenkeeper-ipfs-bitswap-0.4.1

ipfs-bitswap@0.4.1 breaks build ⚠️
ipfs · Jun 6, 2016 · bddefb1 · bddefb1
2 parents 2bd7f50 + 7850dbb
commit bddefb1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "glob": "^7.0.3",
     "hapi": "^13.4.1",
     "ipfs-api": "^4.1.0",
-    "ipfs-bitswap": "^0.4.0",
+    "ipfs-bitswap": "^0.4.1",
     "ipfs-block": "^0.3.0",
     "ipfs-block-service": "^0.4.0",
     "ipfs-merkle-dag": "^0.6.0",

diff --git a/src/cli/commands/bitswap/wantlist.js b/src/cli/commands/bitswap/wantlist.js
@@ -19,7 +19,6 @@ module.exports = Command.extend({
         if (err) {
           throw err
         }
-
         res.Keys.forEach((k) => console.log(k))
       })
     })

diff --git a/src/core/ipfs/bitswap.js b/src/core/ipfs/bitswap.js
@@ -1,13 +1,9 @@
 'use strict'
 
-const bs58 = require('bs58')
-
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
 function formatWantlist (list) {
-  return Array.from(list).map((el) => {
-    return bs58.encode(new Buffer(el[0], 'hex'))
-  })
+  return Array.from(list).map((e) => e[0])
 }
 
 module.exports = function bitswap (self) {

diff --git a/test/cli/test-bitswap.js b/test/cli/test-bitswap.js
@@ -52,7 +52,7 @@ describe('bitswap', function () {
       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bitswap', 'wantlist'], {env})
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist
-          // expect(exitcode).to.equal(0)
+          expect(exitcode).to.equal(0)
           expect(stdout).to.be.eql([
             key
           ])