Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

fix - module not found #66

Merged
merged 1 commit into from
Jan 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions src/ipfs-core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test-core/test-block.js
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down