rebase from master

Author: daviddias

src/ipfs-core/index.js

@@ -134,11 +134,6 @@ function IPFS (repo) {
     get: (multihash, callback) => {
       bs.getBlock(multihash, callback)
     },
-<<<<<<< 712c6909108f5dcf37f3856a04bcd1a4f690b2d8
-    put: (multihash, callback) => {},
-    del: (multihash, callback) => {},
-    stat: (multihash, callback) => {}
-=======
     put: (block, callback) => {
       bs.addBlock(block, callback)
     },
@@ -156,6 +151,5 @@ function IPFS (repo) {
         })
       })
     }
->>>>>>> finish block on js-ipfs-core impl + tests
   }
 }

tests/test-core/test-block.js

@@ -6,21 +6,39 @@ const expect = require('chai').expect
 const base58 = require('bs58')
 const fs = require('fs')
 const IPFS = require('../../src/ipfs-core')
+const Block = require('ipfs-merkle-dag').Block
+
+const isNode = !global.window
+
+const fileA = isNode
+  ? fs.readFileSync(process.cwd() + '/tests/repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data')
+  : new Buffer(require('raw!./../repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data'))
 
 describe('block', () => {
+  var ipfs
+
   it('get', done => {
-    const ipfs = new IPFS()
+    ipfs = new IPFS()
     const b58mh = 'QmVtU7ths96fMgZ8YSZAbKghyieq7AjxNdcqyVzxTt3qVe'
     const mh = new Buffer(base58.decode(b58mh))
     ipfs.block.get(mh, (err, block) => {
       expect(err).to.not.exist
-      const eq = fs.readFileSync(process.cwd() + '/tests/repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data').equals(block.data)
+      const eq = fileA.equals(block.data)
       expect(eq).to.equal(true)
       done()
     })
   })
-  it.skip('put', done => {
-    done()
+  it('put', done => {
+    var b = new Block('random data')
+    ipfs.block.put(b, function (err) {
+      expect(err).to.not.exist
+      ipfs.block.get(b.key, function (err, block) {
+        expect(err).to.not.exist
+        expect(b.data.equals(block.data)).to.equal(true)
+        expect(b.key.equals(block.key)).to.equal(true)
+        done()
+      })
+    })
   })
 
   it('rm', done => {
@@ -42,7 +60,7 @@ describe('block', () => {
 
   it('stat', done => {
     const mh = new Buffer(base58
-        .decode('QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG'))
+        .decode('QmVtU7ths96fMgZ8YSZAbKghyieq7AjxNdcqyVzxTt3qVe'))
     ipfs.block.stat(mh, (err, stats) => {
       expect(err).to.not.exist
       expect(stats.Key.equals(mh)).to.equal(true)