Merge pull request #51 from ipfs/feat/use-new-bitswap

feat/use new bitswap

Author: daviddias

package.json

@@ -36,24 +36,24 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs-block-service#readme",
   "devDependencies": {
-    "aegir": "^9.2.2",
+    "aegir": "^9.3.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "fs-pull-blob-store": "^0.4.1",
     "idb-pull-blob-store": "^0.5.1",
-    "ipfs-block": "^0.5.3",
+    "ipfs-block": "^0.5.4",
     "ipfs-repo": "^0.11.2",
     "lodash": "^4.17.2",
     "ncp": "^2.0.0",
-    "pre-commit": "^1.2.1",
+    "pre-commit": "^1.2.2",
     "rimraf": "^2.5.4"
   },
   "engines": {
     "node": ">=4.0.0"
   },
   "dependencies": {
     "async": "^2.1.4",
-    "cids": "^0.3.4"
+    "cids": "^0.3.5"
   },
   "contributors": [
     "David Dias <daviddias.p@gmail.com>",
@@ -64,4 +64,4 @@
     "npmcdn-to-unpkg-bot <npmcdn-to-unpkg-bot@users.noreply.github.com>",
     "wanderer <mjbecze@gmail.com>"
   ]
-}
+}

src/index.js

@@ -44,24 +44,19 @@ module.exports = class BlockService {
   }
 
   putStream () {
-    let ps
     if (this.isOnline()) {
-      // NOTE: This will have to change in order for bitswap
-      // to understand CID
-      ps = this._bitswap.putStream()
+      return this._bitswap.putStream()
     } else {
-      ps = this._repo.blockstore.putStream()
+      return pull(
+        pull.map((blockAndCID) => {
+          return {
+            data: blockAndCID.block.data,
+            key: blockAndCID.cid.multihash
+          }
+        }),
+        this._repo.blockstore.putStream()
+      )
     }
-
-    return pull(
-      pull.map((blockAndCID) => {
-        return {
-          data: blockAndCID.block.data,
-          key: blockAndCID.cid.multihash
-        }
-      }),
-      ps
-    )
   }
 
   get (cid, callback) {
@@ -78,7 +73,7 @@ module.exports = class BlockService {
 
   getStream (cid) {
     if (this.isOnline()) {
-      return this._bitswap.getStream(cid.multihash)
+      return this._bitswap.getStream(cid)
     }
 
     return this._repo.blockstore.getStream(cid.multihash)