From f95cd57ddf2fa06b6fc0e182b2643a13c47170ef Mon Sep 17 00:00:00 2001 From: Volker Mische Date: Wed, 31 Oct 2018 14:06:41 +0100 Subject: [PATCH] fix: remove accidentally committed code Something went wrong when rebasing https://github.com/ipfs/js-ipfs/pull/1668 and some code was introduced which shouldn't be there. This commit removes that code again. --- src/cli/utils.js | 15 --------------- src/core/index.js | 4 +--- test/core/init.spec.js | 6 +----- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/cli/utils.js b/src/cli/utils.js index 8641c65908..02f830f6c6 100644 --- a/src/cli/utils.js +++ b/src/cli/utils.js @@ -11,21 +11,6 @@ const Progress = require('progress') const byteman = require('byteman') const promisify = require('promisify-es6') -// All known IPLD formats -const ipldBitcoin = require('ipld-bitcoin') -const ipldDagCbor = require('ipld-dag-cbor') -const ipldDagPb = require('ipld-dag-pb') -const ipldEthAccountSnapshot = require('ipld-ethereum').ethAccountSnapshot -const ipldEthBlock = require('ipld-ethereum').ethBlock -const ipldEthBlockList = require('ipld-ethereum').ethBlockList -const ipldEthStateTrie = require('ipld-ethereum').ethStateTrie -const ipldEthStorageTrie = require('ipld-ethereum').ethStorageTrie -const ipldEthTrie = require('ipld-ethereum').ethTxTrie -const ipldEthTx = require('ipld-ethereum').ethTx -const ipldGit = require('ipld-git') -const ipldRaw = require('ipld-raw') -const ipldZcash = require('ipld-zcash') - exports = module.exports exports.isDaemonOn = isDaemonOn diff --git a/src/core/index.js b/src/core/index.js index 990cd38053..fb79dfbf0d 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -87,9 +87,7 @@ class IPFS extends EventEmitter { multiaddr: multiaddr, multibase: multibase, multihash: multihash, - CID: CID, - dagPB: ipldDagPb, - dagCBOR: ipldDagCbor + CID: CID } // IPFS Core Internals diff --git a/test/core/init.spec.js b/test/core/init.spec.js index 84c8df411c..4db10e7181 100644 --- a/test/core/init.spec.js +++ b/test/core/init.spec.js @@ -15,8 +15,6 @@ const isIPFS = require('is-ipfs') const multiaddr = require('multiaddr') const multibase = require('multibase') const multihash = require('multihashes') -const ipldDagCbor = require('ipld-dag-cbor') -const ipldDagPb = require('ipld-dag-pb') const CID = require('cids') const IPFS = require('../../src/core') @@ -122,9 +120,7 @@ describe('init', () => { multiaddr: multiaddr, multibase: multibase, multihash: multihash, - CID: CID, - dagPB: ipldDagPb, - dagCBOR: ipldDagCbor + CID: CID }) })