feat: cids on get and delete

Author: daviddias

src/index.js

@@ -52,9 +52,9 @@ module.exports = class BlockService {
     )
   }
 
-  get (key, callback) {
+  get (cid, callback) {
     pull(
-      this.getStream(key),
+      this.getStream(cid),
       pull.collect((err, result) => {
         if (err) {
           return callback(err)
@@ -64,21 +64,21 @@ module.exports = class BlockService {
     )
   }
 
-  getStream (key) {
+  getStream (cid) {
     if (this.isOnline()) {
-      return this._bitswap.getStream(key)
+      return this._bitswap.getStream(cid)
     }
 
-    return this._repo.blockstore.getStream(key)
+    return this._repo.blockstore.getStream(cid.multihash)
   }
 
-  delete (keys, callback) {
-    if (!Array.isArray(keys)) {
-      keys = [keys]
+  delete (cids, callback) {
+    if (!Array.isArray(cids)) {
+      cids = [cids]
     }
 
-    parallelLimit(keys.map((key) => (next) => {
-      this._repo.blockstore.delete(key, next)
+    parallelLimit(cids.map((cid) => (next) => {
+      this._repo.blockstore.delete(cid.multihash, next)
     }), 100, callback)
   }
 }

test/block-service-test.js

@@ -6,6 +6,7 @@ const Block = require('ipfs-block')
 const pull = require('pull-stream')
 const _ = require('lodash')
 const series = require('run-series')
+const CID = require('cids')
 
 const BlockService = require('../src')
 
@@ -20,10 +21,11 @@ module.exports = (repo) => {
     describe('offline', () => {
       it('store and get a block', (done) => {
         const b = new Block('A random data block')
+        const cid = new CID(b.key())
 
         series([
           (cb) => bs.put(b, cb),
-          (cb) => bs.get(b.key(), (err, block) => {
+          (cb) => bs.get(cid, (err, block) => {
             if (err) {
               return cb(err)
             }
@@ -35,7 +37,9 @@ module.exports = (repo) => {
 
       it('get a non existent block', (done) => {
         const b = new Block('Not stored')
-        bs.get(b.key(), (err, block) => {
+        const cid = new CID(b.key())
+
+        bs.get(cid, (err, block) => {
           expect(err).to.exist
           done()
         })
@@ -61,13 +65,6 @@ module.exports = (repo) => {
         )
       })
 
-      it('get: bad invocation', (done) => {
-        bs.get(null, (err) => {
-          expect(err).to.be.an('error')
-          done()
-        })
-      })
-
       it('get many blocks', (done) => {
         const b1 = new Block('1')
         const b2 = new Block('2')
@@ -94,7 +91,8 @@ module.exports = (repo) => {
               b3.key()
             ]),
             pull.map((key) => {
-              return bs.getStream(key)
+              const cid = new CID(key)
+              return bs.getStream(cid)
             }),
             pull.flatten(),
             pull.collect((err, blocks) => {
@@ -114,26 +112,21 @@ module.exports = (repo) => {
         const b = new Block('Will not live that much')
         bs.put(b, (err) => {
           expect(err).to.not.exist
-          bs.delete(b.key(), (err) => {
+          const cid = new CID(b.key())
+          bs.delete(cid, (err) => {
             expect(err).to.not.exist
-            bs.get(b.key(), (err, block) => {
+            bs.get(cid, (err, block) => {
               expect(err).to.exist
               done()
             })
           })
         })
       })
 
-      it('delete: bad invocation', (done) => {
-        bs.delete(null, (err) => {
-          expect(err).to.be.an('error')
-          done()
-        })
-      })
-
       it('delete a non existent block', (done) => {
         const b = new Block('I do not exist')
-        bs.delete(b.key(), (err) => {
+        const cid = new CID(b.key())
+        bs.delete(cid, (err) => {
           expect(err).to.not.exist
           done()
         })
@@ -145,9 +138,9 @@ module.exports = (repo) => {
         const b3 = new Block('3')
 
         bs.delete([
-          b1.key(),
-          b2.key(),
-          b3.key()
+          new CID(b1.key()),
+          new CID(b2.key()),
+          new CID(b3.key())
         ], (err) => {
           expect(err).to.not.exist
           done()
@@ -173,7 +166,8 @@ module.exports = (repo) => {
                 return block.key()
               }),
               pull.map((key) => {
-                return bs.getStream(key)
+                const cid = new CID(key)
+                return bs.getStream(cid)
               }),
               pull.flatten(),
               pull.collect((err, retrievedBlocks) => {