refactor: return CID instances from block.rm

Author: Alan Shaw

src/block/rm.js

@@ -34,7 +34,7 @@ module.exports = (common, options) => {
 
       const result = await all(ipfs.block.rm(cid))
       expect(result).to.be.an('array').and.to.have.lengthOf(1)
-      expect(result[0]).to.have.property('hash', cid.toString())
+      expect(result[0].cid.toString()).equal(cid.toString())
       expect(result[0]).to.not.have.property('error')
 
       // did we actually remove the block?
@@ -51,7 +51,7 @@ module.exports = (common, options) => {
       const result = await all(ipfs.block.rm(cid.toString()))
 
       expect(result).to.be.an('array').and.to.have.lengthOf(1)
-      expect(result[0]).to.have.property('hash', cid.toString())
+      expect(result[0].cid.toString()).to.equal(cid.toString())
       expect(result[0]).to.not.have.property('error')
     })
 
@@ -63,7 +63,7 @@ module.exports = (common, options) => {
       const result = await all(ipfs.block.rm(cid.buffer))
 
       expect(result).to.be.an('array').and.to.have.lengthOf(1)
-      expect(result[0]).to.have.property('hash', cid.toString())
+      expect(result[0].cid.toString()).to.equal(cid.toString())
       expect(result[0]).to.not.have.property('error')
     })
 
@@ -88,7 +88,7 @@ module.exports = (common, options) => {
       expect(result).to.be.an('array').and.to.have.lengthOf(3)
 
       result.forEach((res, index) => {
-        expect(res).to.have.property('hash', cids[index].toString())
+        expect(res.cid.toString()).to.equal(cids[index].toString())
         expect(res).to.not.have.property('error')
       })
     })
@@ -106,7 +106,8 @@ module.exports = (common, options) => {
       const result = await all(ipfs.block.rm(cid))
 
       expect(result).to.be.an('array').and.to.have.lengthOf(1)
-      expect(result[0]).to.have.property('error').and.to.include('block not found')
+      expect(result[0]).to.have.property('error')
+      expect(result[0].error.message).to.include('block not found')
     })
 
     it('should not error when force removing non-existent blocks', async () => {
@@ -122,7 +123,7 @@ module.exports = (common, options) => {
       const result = await all(ipfs.block.rm(cid, { force: true }))
 
       expect(result).to.be.an('array').and.to.have.lengthOf(1)
-      expect(result[0]).to.have.property('hash', cid.toString())
+      expect(result[0].cid.toString()).to.equal(cid.toString())
       expect(result[0]).to.not.have.property('error')
     })
 
@@ -146,7 +147,8 @@ module.exports = (common, options) => {
       const result = await all(ipfs.block.rm(cid))
 
       expect(result).to.be.an('array').and.to.have.lengthOf(1)
-      expect(result[0]).to.have.property('error').and.to.include('pinned')
+      expect(result[0]).to.have.property('error')
+      expect(result[0].error.message).to.include('pinned')
     })
   })
 }