From e7f043258e25d188108d9fdcf325c99f4a82fd76 Mon Sep 17 00:00:00 2001 From: Volker Mische Date: Mon, 26 Feb 2018 16:36:34 +0100 Subject: [PATCH] fix: use "ipld" instead of "ipld-resolver" The "ipld-resolver" has been renamed to just "ipld". --- package.json | 2 +- src/core/components/dag.js | 6 +++--- src/core/components/files.js | 12 ++++++------ src/core/components/init-assets.js | 2 +- src/core/components/object.js | 8 ++++---- src/core/index.js | 4 ++-- src/http/api/resources/file.js | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 850bbf85bf..fcafe870f3 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "ipfs-repo": "~0.18.7", "ipfs-unixfs": "~0.1.14", "ipfs-unixfs-engine": "~0.24.2", - "ipld-resolver": "~0.14.1", + "ipld": "^0.15.0", "is-ipfs": "^0.3.2", "is-stream": "^1.1.0", "joi": "^13.1.2", diff --git a/src/core/components/dag.js b/src/core/components/dag.js index 1bf52b8abb..b5d77e0c6c 100644 --- a/src/core/components/dag.js +++ b/src/core/components/dag.js @@ -7,7 +7,7 @@ const pull = require('pull-stream') module.exports = function dag (self) { return { put: promisify((dagNode, options, callback) => { - self._ipldResolver.put(dagNode, options, callback) + self._ipld.put(dagNode, options, callback) }), get: promisify((cid, path, options, callback) => { @@ -35,7 +35,7 @@ module.exports = function dag (self) { } } - self._ipldResolver.get(cid, path, options, callback) + self._ipld.get(cid, path, options, callback) }), tree: promisify((cid, path, options, callback) => { @@ -70,7 +70,7 @@ module.exports = function dag (self) { } pull( - self._ipldResolver.treeStream(cid, path, options), + self._ipld.treeStream(cid, path, options), pull.collect(callback) ) }) diff --git a/src/core/components/files.js b/src/core/components/files.js index d2afecf767..f0a5e94918 100644 --- a/src/core/components/files.js +++ b/src/core/components/files.js @@ -121,7 +121,7 @@ module.exports = function files (self) { return pull( pull.map(normalizeContent), pull.flatten(), - importer(self._ipldResolver, opts), + importer(self._ipld, opts), pull.asyncMap(prepareFile.bind(null, self, opts)) ) } @@ -139,7 +139,7 @@ module.exports = function files (self) { const d = deferred.source() pull( - exporter(ipfsPath, self._ipldResolver), + exporter(ipfsPath, self._ipld), pull.collect((err, files) => { if (err) { return d.abort(err) } if (files && files.length > 1) { @@ -168,7 +168,7 @@ module.exports = function files (self) { const maxDepth = recursive ? global.Infinity : pathDepth return pull( - exporter(ipfsPath, self._ipldResolver, { maxDepth: maxDepth }), + exporter(ipfsPath, self._ipld, { maxDepth: maxDepth }), pull.filter(node => recursive ? node.depth >= pathDepth : node.depth === pathDepth ), @@ -245,7 +245,7 @@ module.exports = function files (self) { get: promisify((ipfsPath, callback) => { pull( - exporter(ipfsPath, self._ipldResolver), + exporter(ipfsPath, self._ipld), pull.asyncMap((file, cb) => { if (file.content) { pull( @@ -267,7 +267,7 @@ module.exports = function files (self) { getReadableStream: (ipfsPath) => { return toStream.source( pull( - exporter(ipfsPath, self._ipldResolver), + exporter(ipfsPath, self._ipld), pull.map((file) => { if (file.content) { file.content = toStream.source(file.content) @@ -281,7 +281,7 @@ module.exports = function files (self) { }, getPullStream: (ipfsPath) => { - return exporter(ipfsPath, self._ipldResolver) + return exporter(ipfsPath, self._ipld) }, lsImmutable: promisify((ipfsPath, options, callback) => { diff --git a/src/core/components/init-assets.js b/src/core/components/init-assets.js index 945c47f5b4..00c37120a8 100644 --- a/src/core/components/init-assets.js +++ b/src/core/components/init-assets.js @@ -26,7 +26,7 @@ module.exports = function addDefaultAssets (self, log, callback) { }), // Filter out directories, which are undefined from above pull.filter(Boolean), - importer(self._ipldResolver), + importer(self._ipld), pull.through((el) => { if (el.path === 'init-docs') { const cid = new CID(el.multihash) diff --git a/src/core/components/object.js b/src/core/components/object.js index 1b1f51e0e1..5ce053128f 100644 --- a/src/core/components/object.js +++ b/src/core/components/object.js @@ -80,7 +80,7 @@ module.exports = function object (self) { if (err) { return cb(err) } - self._ipldResolver.put(node, { + self._ipld.put(node, { cid: new CID(node.multihash) }, (err) => { cb(err, node) @@ -111,7 +111,7 @@ module.exports = function object (self) { if (err) { return callback(err) } - self._ipldResolver.put(node, { + self._ipld.put(node, { cid: new CID(node.multihash) }, (err) => { if (err) { @@ -166,7 +166,7 @@ module.exports = function object (self) { } function next () { - self._ipldResolver.put(node, { + self._ipld.put(node, { cid: new CID(node.multihash) }, (err) => { if (err) { @@ -193,7 +193,7 @@ module.exports = function object (self) { } const cid = new CID(mh) - self._ipldResolver.get(cid, (err, result) => { + self._ipld.get(cid, (err, result) => { if (err) { return callback(err) } diff --git a/src/core/index.js b/src/core/index.js index 2d0da3e53f..f9912d25d4 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -1,7 +1,7 @@ 'use strict' const BlockService = require('ipfs-block-service') -const IPLDResolver = require('ipld-resolver') +const Ipld = require('ipld') const PeerId = require('peer-id') const PeerInfo = require('peer-info') const multiaddr = require('multiaddr') @@ -68,7 +68,7 @@ class IPFS extends EventEmitter { this._libp2pNode = undefined this._bitswap = undefined this._blockService = new BlockService(this._repo) - this._ipldResolver = new IPLDResolver(this._blockService) + this._ipld = new Ipld(this._blockService) this._pubsub = undefined // IPFS Core exposed components diff --git a/src/http/api/resources/file.js b/src/http/api/resources/file.js index 6c0b6b4c4c..b786bebc19 100644 --- a/src/http/api/resources/file.js +++ b/src/http/api/resources/file.js @@ -80,7 +80,7 @@ exports.ls = { const rootDepth = subpaths.length pull( - exporter(path, ipfs._ipldResolver, { maxDepth: rootDepth + 1 }), + exporter(path, ipfs._ipld, { maxDepth: rootDepth + 1 }), pull.collect((err, files) => { if (err) { return reply({