Skip to content
This repository was archived by the owner on Aug 12, 2020. It is now read-only.

Commit f4de206

Browse files
vmxdaviddias
vmx
authored and
daviddias
committed
fix: use "ipld" instead of "ipld-resolver"
The "ipld-resolver" has been renamed to just "ipld".
1 parent 3d6c9b1 commit f4de206

20 files changed

+114
-114
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
"cids": "~0.5.2",
6161
"deep-extend": "~0.5.0",
6262
"ipfs-unixfs": "~0.1.14",
63+
"ipld": "^0.15.0",
6364
"ipld-dag-pb": "~0.13.1",
64-
"ipld-resolver": "~0.14.1",
6565
"left-pad": "^1.2.0",
6666
"lodash": "^4.17.5",
6767
"multihashes": "~0.4.13",

‎src/builder/builder.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const defaultOptions = {
1919
}
2020
}
2121

22-
module.exports = function (createChunker, ipldResolver, createReducer, _options) {
22+
module.exports = function (createChunker, ipld, createReducer, _options) {
2323
const options = extend({}, defaultOptions, _options)
2424

2525
return function (source) {
@@ -69,7 +69,7 @@ module.exports = function (createChunker, ipldResolver, createReducer, _options)
6969
cid = cid.toV1()
7070
}
7171

72-
ipldResolver.put(node, { cid }, (err) => cb(err, node))
72+
ipld.put(node, { cid }, (err) => cb(err, node))
7373
}
7474
], (err, node) => {
7575
if (err) {
@@ -92,7 +92,7 @@ module.exports = function (createChunker, ipldResolver, createReducer, _options)
9292
return callback(new Error('invalid content'))
9393
}
9494

95-
const reducer = createReducer(reduce(file, ipldResolver, options), options)
95+
const reducer = createReducer(reduce(file, ipld, options), options)
9696

9797
let previous
9898
let count = 0
@@ -121,7 +121,7 @@ module.exports = function (createChunker, ipldResolver, createReducer, _options)
121121
cid = cid.toV1()
122122
}
123123

124-
ipldResolver.put(leaf.DAGNode, { cid }, (err) => callback(err, leaf))
124+
ipld.put(leaf.DAGNode, { cid }, (err) => callback(err, leaf))
125125
}),
126126
pull.map((leaf) => {
127127
return {

‎src/builder/create-build-stream.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const pullPushable = require('pull-pushable')
44
const pullWrite = require('pull-write')
55

6-
module.exports = function createBuildStream (createStrategy, ipldResolver, options) {
6+
module.exports = function createBuildStream (createStrategy, _ipld, options) {
77
const source = pullPushable()
88

99
const sink = pullWrite(

‎src/builder/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ const defaultOptions = {
1616
reduceSingleLeafToSelf: false
1717
}
1818

19-
module.exports = function (Chunker, ipldResolver, _options) {
19+
module.exports = function (Chunker, ipld, _options) {
2020
assert(Chunker, 'Missing chunker creator function')
21-
assert(ipldResolver, 'Missing IPLD Resolver')
21+
assert(ipld, 'Missing IPLD')
2222

2323
const options = Object.assign({}, defaultOptions, _options)
2424

2525
const strategyName = options.strategy
2626
const reducer = reducers[strategyName]
2727
assert(reducer, 'Unknown importer build strategy name: ' + strategyName)
2828

29-
const createStrategy = Builder(Chunker, ipldResolver, reducer, options)
29+
const createStrategy = Builder(Chunker, ipld, reducer, options)
3030

31-
return createBuildStream(createStrategy, ipldResolver, options)
31+
return createBuildStream(createStrategy, ipld, options)
3232
}

‎src/builder/reduce.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const CID = require('cids')
88
const DAGLink = dagPB.DAGLink
99
const DAGNode = dagPB.DAGNode
1010

11-
module.exports = function (file, ipldResolver, options) {
11+
module.exports = function (file, ipld, options) {
1212
return function (leaves, callback) {
1313
if (leaves.length === 1 && (leaves[0].single || options.reduceSingleLeafToSelf)) {
1414
const leave = leaves[0]
@@ -42,7 +42,7 @@ module.exports = function (file, ipldResolver, options) {
4242
cid = cid.toV1()
4343
}
4444

45-
ipldResolver.put(node, { cid }, (err) => cb(err, node))
45+
ipld.put(node, { cid }, (err) => cb(err, node))
4646
}
4747
], (err, node) => {
4848
if (err) {

‎src/importer/dir-flat.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class DirFlat extends Dir {
4848
)
4949
}
5050

51-
flush (path, ipldResolver, source, callback) {
51+
flush (path, ipld, source, callback) {
5252
const links = Object.keys(this._children)
5353
.map((key) => {
5454
const child = this._children[key]
@@ -70,7 +70,7 @@ class DirFlat extends Dir {
7070
cid = cid.toV1()
7171
}
7272

73-
ipldResolver.put(node, { cid }, (err) => callback(err, node))
73+
ipld.put(node, { cid }, (err) => callback(err, node))
7474
},
7575
(node, callback) => {
7676
this.multihash = node.multihash

‎src/importer/dir-sharded.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class DirSharded extends Dir {
7070
this._bucket.eachLeafSeries(iterator, callback)
7171
}
7272

73-
flush (path, ipldResolver, source, callback) {
74-
flush(this._options, this._bucket, path, ipldResolver, source, (err, node) => {
73+
flush (path, ipld, source, callback) {
74+
flush(this._options, this._bucket, path, ipld, source, (err, node) => {
7575
if (err) {
7676
callback(err)
7777
} else {
@@ -89,7 +89,7 @@ function createDirSharded (props, _options) {
8989
return new DirSharded(props, _options)
9090
}
9191

92-
function flush (options, bucket, path, ipldResolver, source, callback) {
92+
function flush (options, bucket, path, ipld, source, callback) {
9393
const children = bucket._children // TODO: intromission
9494
let index = 0
9595
const links = []
@@ -119,7 +119,7 @@ function flush (options, bucket, path, ipldResolver, source, callback) {
119119
function collectChild (child, index, callback) {
120120
const labelPrefix = leftPad(index.toString(16).toUpperCase(), 2, '0')
121121
if (Bucket.isBucket(child)) {
122-
flush(options, child, path, ipldResolver, null, (err, node) => {
122+
flush(options, child, path, ipld, null, (err, node) => {
123123
if (err) {
124124
callback(err)
125125
return // early
@@ -154,7 +154,7 @@ function flush (options, bucket, path, ipldResolver, source, callback) {
154154
cid = cid.toV1()
155155
}
156156

157-
ipldResolver.put(node, { cid }, (err) => callback(err, node))
157+
ipld.put(node, { cid }, (err) => callback(err, node))
158158
},
159159
(node, callback) => {
160160
const pushable = {

‎src/importer/flush-tree.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const waterfall = require('async/waterfall')
99
const DAGLink = dagPB.DAGLink
1010
const DAGNode = dagPB.DAGNode
1111

12-
module.exports = (files, ipldResolver, source, callback) => {
12+
module.exports = (files, ipld, source, callback) => {
1313
// 1) convert files to a tree
1414
const fileTree = createTree(files)
1515

@@ -26,7 +26,7 @@ module.exports = (files, ipldResolver, source, callback) => {
2626
const sizeIndex = createSizeIndex(files)
2727

2828
// 3) bottom up flushing
29-
traverse(fileTree, sizeIndex, null, ipldResolver, source, callback)
29+
traverse(fileTree, sizeIndex, null, ipld, source, callback)
3030
}
3131

3232
/*
@@ -106,13 +106,13 @@ function createSizeIndex (files) {
106106
* If the value is not an object
107107
* add as a link to the dirNode
108108
*/
109-
function traverse (tree, sizeIndex, path, ipldResolver, source, done) {
109+
function traverse (tree, sizeIndex, path, ipld, source, done) {
110110
mapValues(tree, (node, key, cb) => {
111111
if (isLeaf(node)) {
112112
return cb(null, node)
113113
}
114114

115-
traverse(node, sizeIndex, path ? `${path}/${key}` : key, ipldResolver, source, cb)
115+
traverse(node, sizeIndex, path ? `${path}/${key}` : key, ipld, source, cb)
116116
}, (err, tree) => {
117117
if (err) {
118118
return done(err)
@@ -135,7 +135,7 @@ function traverse (tree, sizeIndex, path, ipldResolver, source, done) {
135135
(node, cb) => {
136136
sizeIndex[mh.toB58String(node.multihash)] = node.size
137137

138-
ipldResolver.put(node, {
138+
ipld.put(node, {
139139
cid: new CID(node.multihash)
140140
}, (err) => cb(err, node))
141141
}

‎src/importer/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const defaultOptions = {
1717
chunker: 'fixed'
1818
}
1919

20-
module.exports = function (ipldResolver, _options) {
20+
module.exports = function (ipld, _options) {
2121
const options = Object.assign({}, defaultOptions, _options)
2222
const Chunker = chunkers[options.chunker]
2323
assert(Chunker, 'Unknkown chunker named ' + options.chunker)
@@ -39,9 +39,9 @@ module.exports = function (ipldResolver, _options) {
3939
source: pushable()
4040
}
4141

42-
const dagStream = DAGBuilder(Chunker, ipldResolver, options)
42+
const dagStream = DAGBuilder(Chunker, ipld, options)
4343

44-
const treeBuilder = createTreeBuilder(ipldResolver, options)
44+
const treeBuilder = createTreeBuilder(ipld, options)
4545
const treeBuilderStream = treeBuilder.stream()
4646
const pausable = pause(() => {})
4747

‎src/importer/tree-builder.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const defaultOptions = {
1818
onlyHash: false
1919
}
2020

21-
function createTreeBuilder (ipldResolver, _options) {
21+
function createTreeBuilder (ipld, _options) {
2222
const options = Object.assign({}, defaultOptions, _options)
2323

2424
const queue = createQueue(consumeQueue, 1)
@@ -202,7 +202,7 @@ function createTreeBuilder (ipldResolver, _options) {
202202
// don't flush directory unless it's been modified
203203

204204
tree.dirty = false
205-
tree.flush(path, ipldResolver, stream.source, (err, node) => {
205+
tree.flush(path, ipld, stream.source, (err, node) => {
206206
if (err) {
207207
callback(err)
208208
} else {

‎test/builder-dir-sharding.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ chai.use(require('dirty-chai'))
99
const expect = chai.expect
1010
const mh = require('multihashes')
1111
const BlockService = require('ipfs-block-service')
12-
const IPLDResolver = require('ipld-resolver')
12+
const Ipld = require('ipld')
1313
const pull = require('pull-stream')
1414
const pushable = require('pull-pushable')
1515
const whilst = require('async/whilst')
@@ -20,11 +20,11 @@ module.exports = (repo) => {
2020
describe('builder: directory sharding', function () {
2121
this.timeout(30 * 1000)
2222

23-
let ipldResolver
23+
let ipld
2424

2525
before(() => {
2626
const bs = new BlockService(repo)
27-
ipldResolver = new IPLDResolver(bs)
27+
ipld = new Ipld(bs)
2828
})
2929

3030
describe('basic dirbuilder', () => {
@@ -42,7 +42,7 @@ module.exports = (repo) => {
4242
content: pull.values([Buffer.from('i have the best bytes')])
4343
}
4444
]),
45-
importer(ipldResolver, options),
45+
importer(ipld, options),
4646
pull.collect((err, nodes) => {
4747
expect(err).to.not.exist()
4848
expect(nodes.length).to.be.eql(2)
@@ -67,7 +67,7 @@ module.exports = (repo) => {
6767
content: pull.values([Buffer.from('i have the best bytes')])
6868
}
6969
]),
70-
importer(ipldResolver, options),
70+
importer(ipld, options),
7171
pull.collect((err, nodes) => {
7272
expect(err).to.not.exist()
7373
expect(nodes.length).to.be.eql(2)
@@ -83,7 +83,7 @@ module.exports = (repo) => {
8383

8484
it('exporting unsharded hash results in the correct files', (done) => {
8585
pull(
86-
exporter(nonShardedHash, ipldResolver),
86+
exporter(nonShardedHash, ipld),
8787
pull.collect((err, nodes) => {
8888
expect(err).to.not.exist()
8989
expect(nodes.length).to.be.eql(2)
@@ -109,7 +109,7 @@ module.exports = (repo) => {
109109

110110
it('exporting sharded hash results in the correct files', (done) => {
111111
pull(
112-
exporter(shardedHash, ipldResolver),
112+
exporter(shardedHash, ipld),
113113
pull.collect((err, nodes) => {
114114
expect(err).to.not.exist()
115115
expect(nodes.length).to.be.eql(2)
@@ -142,7 +142,7 @@ module.exports = (repo) => {
142142
const push = pushable()
143143
pull(
144144
push,
145-
importer(ipldResolver),
145+
importer(ipld),
146146
pull.collect((err, nodes) => {
147147
expect(err).to.not.exist()
148148
expect(nodes.length).to.be.eql(maxDirs + 1)
@@ -179,7 +179,7 @@ module.exports = (repo) => {
179179
const contentEntries = []
180180
const entries = {}
181181
pull(
182-
exporter(rootHash, ipldResolver),
182+
exporter(rootHash, ipld),
183183
pull.asyncMap((node, callback) => {
184184
if (node.content) {
185185
pull(
@@ -234,7 +234,7 @@ module.exports = (repo) => {
234234
const push = pushable()
235235
pull(
236236
push,
237-
importer(ipldResolver),
237+
importer(ipld),
238238
pull.collect((err, nodes) => {
239239
expect(err).to.not.exist()
240240
const last = nodes[nodes.length - 1]
@@ -281,7 +281,7 @@ module.exports = (repo) => {
281281
it('exports a big dir', (done) => {
282282
const entries = {}
283283
pull(
284-
exporter(rootHash, ipldResolver),
284+
exporter(rootHash, ipld),
285285
pull.asyncMap((node, callback) => {
286286
if (node.content) {
287287
pull(
@@ -340,7 +340,7 @@ module.exports = (repo) => {
340340
it('exports a big dir with subpath', (done) => {
341341
const exportHash = mh.toB58String(rootHash) + '/big/big/2000'
342342
pull(
343-
exporter(exportHash, ipldResolver),
343+
exporter(exportHash, ipld),
344344
pull.collect(collected)
345345
)
346346

‎test/builder-only-hash.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ chai.use(require('dirty-chai'))
66
const expect = chai.expect
77
const BlockService = require('ipfs-block-service')
88
const pull = require('pull-stream')
9-
const IPLDResolver = require('ipld-resolver')
9+
const Ipld = require('ipld')
1010
const CID = require('cids')
1111
const createBuilder = require('../src/builder')
1212
const FixedSizeChunker = require('../src/chunker/fixed-size')
1313

1414
module.exports = (repo) => {
1515
describe('builder: onlyHash', () => {
16-
let ipldResolver
16+
let ipld
1717

1818
before(() => {
1919
const bs = new BlockService(repo)
20-
ipldResolver = new IPLDResolver(bs)
20+
ipld = new Ipld(bs)
2121
})
2222

2323
it('will only chunk and hash if passed an "onlyHash" option', (done) => {
@@ -27,7 +27,7 @@ module.exports = (repo) => {
2727
const node = nodes[0]
2828
expect(node).to.exist()
2929

30-
ipldResolver.get(new CID(node.multihash), (err, res) => {
30+
ipld.get(new CID(node.multihash), (err, res) => {
3131
expect(err).to.exist()
3232
done()
3333
})
@@ -45,7 +45,7 @@ module.exports = (repo) => {
4545

4646
pull(
4747
pull.values([inputFile]),
48-
createBuilder(FixedSizeChunker, ipldResolver, options),
48+
createBuilder(FixedSizeChunker, ipld, options),
4949
pull.collect(onCollected)
5050
)
5151
})

0 commit comments

Comments
 (0)