Errors getBlock(s) on non-existence.

ipfs · Apr 15, 2016 · 27e4b2e · 27e4b2e
1 parent 560497f
commit 27e4b2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/src/block-service.js b/src/block-service.js
@@ -35,19 +35,11 @@ function BlockService (ipfsRepo, exchange) {
       return callback(new Error('Invalid multihash'))
     }
 
-    ipfsRepo.datastore.exists(multihash, (err, exists) => {
-      if (err) { return callback(err) }
-
-      if (exists) {
-        ipfsRepo.datastore.createReadStream(multihash, extension)
-          .pipe(bl((err, data) => {
-            if (err) { return callback(err) }
-            callback(null, new Block(data, extension))
-          }))
-      } else {
-        callback(null, null)
-      }
-    })
+    ipfsRepo.datastore.createReadStream(multihash, extension)
+      .pipe(bl((err, data) => {
+        if (err) { return callback(err) }
+        callback(null, new Block(data, extension))
+      }))
   }
 
   this.getBlocks = (multihashes, extension, callback) => {

diff --git a/test/block-service-test.js b/test/block-service-test.js
@@ -44,8 +44,7 @@ module.exports = (repo) => {
     it('get a non existent block', (done) => {
       const b = new Block('Not stored')
       bs.getBlock(b.key, (err, block) => {
-        expect(err).to.not.exist
-        expect(block).to.not.exist
+        expect(err).to.exist
         done()
       })
     })
@@ -109,8 +108,8 @@ module.exports = (repo) => {
         expect(err).to.not.exist
 
         bs.getBlocks([b1.key, b2.key, b3.key], (err, blocks) => {
-          expect(err).to.not.exist
-          expect(blocks).to.have.lengthOf(2)
+          expect(err).to.exist
+          expect(blocks).to.have.lengthOf(0)
           done()
         })
       })
@@ -123,8 +122,7 @@ module.exports = (repo) => {
         bs.deleteBlock(b.key, (err) => {
           expect(err).to.not.exist
           bs.getBlock(b.key, (err, block) => {
-            expect(err).to.not.exist
-            expect(block).to.not.exist
+            expect(err).to.exist
             done()
           })
         })
@@ -145,8 +143,7 @@ module.exports = (repo) => {
         bs.deleteBlock(b.key, 'ext', (err) => {
           expect(err).to.not.exist
           bs.getBlock(b.key, 'ext', (err, block) => {
-            expect(err).to.not.exist
-            expect(block).to.not.exist
+            expect(err).to.exist
             done()
           })
         })