Merge pull request #66 from ipfs/update/block-dep

fix - module not found

Author: daviddias

package.json

@@ -66,8 +66,9 @@
     "bs58": "^3.0.0",
     "debug": "^2.2.0",
     "hapi": "^12.0.0",
+    "ipfs-blocks": "^0.1.0",
+    "ipfs-merkle-dag": "^0.1.1",
     "ipfs-repo": "^0.5.0",
-    "ipfs-merkle-dag": "vijayee/js-ipfs-merkle-dag",
     "lodash.get": "^4.0.0",
     "lodash.set": "^4.0.0",
     "ronin": "^0.3.11"

src/ipfs-core/index.js

@@ -2,8 +2,9 @@
 
 const defaultRepo = require('./default-repo')
 // const bl = require('bl')
-const MerkleDAG = require('ipfs-merkle-dag')
-const BlockService = MerkleDAG.BlockService
+// const MerkleDAG = require('ipfs-merkle-dag')
+const blocks = require('ipfs-blocks')
+const BlockService = blocks.BlockService
 // const Block = MerkleDAG.Block
 
 exports = module.exports = IPFS

tests/test-core/test-block.js

@@ -6,7 +6,7 @@ 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 Block = require('ipfs-blocks').Block
 
 const isNode = !global.window