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

Commit d88a561

Browse files
authored
chore: update deps
* chore: update deps * test: fix test that was assuming that every multihash is implemented in multihashing-async * only passes with pull-block 1.2.0 * pull-block 1.2.0 * chore: fix travis
1 parent d78f82c commit d88a561

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

circle.yml

+4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ dependencies:
66
pre:
77
- google-chrome --version
88
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
9+
- for v in $(curl http://archive.ubuntu.com/ubuntu/pool/main/n/nss/ | grep "href=" | grep "libnss3.*deb\"" -o | grep -o "libnss3.*deb" | grep "3.28" | grep "14.04"); do curl -L -o $v http://archive.ubuntu.com/ubuntu/pool/main/n/nss/$v; done && rm libnss3-tools*_i386.deb libnss3-dev*_i386.deb
910
- sudo dpkg -i google-chrome.deb || true
11+
- sudo dpkg -i libnss3*.deb || true
1012
- sudo apt-get update
13+
- sudo apt-get install -f || true
14+
- sudo dpkg -i libnss3*.deb
1115
- sudo apt-get install -f
1216
- sudo apt-get install --only-upgrade lsb-base
1317
- sudo dpkg -i google-chrome.deb

package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,38 +43,38 @@
4343
"aegir": "^11.0.2",
4444
"chai": "^4.1.2",
4545
"dirty-chai": "^2.0.1",
46-
"ipfs": "^0.25.4",
46+
"ipfs": "^0.26.0",
4747
"ipfs-block-service": "^0.12.0",
4848
"ipfs-repo": "^0.17.0",
4949
"ncp": "^2.0.0",
5050
"pre-commit": "^1.2.2",
5151
"pull-generate": "^2.2.0",
5252
"pull-zip": "^2.0.1",
53-
"rimraf": "^2.6.1",
54-
"sinon": "^3.2.1",
53+
"rimraf": "^2.6.2",
54+
"sinon": "^4.0.1",
5555
"split": "^1.0.1"
5656
},
5757
"dependencies": {
5858
"async": "^2.5.0",
5959
"bs58": "^4.0.1",
60-
"cids": "^0.5.1",
60+
"cids": "~0.5.2",
6161
"deep-extend": "^0.5.0",
6262
"ipfs-unixfs": "^0.1.13",
6363
"ipld-dag-pb": "^0.11.2",
64-
"ipld-resolver": "^0.13.1",
64+
"ipld-resolver": "^0.13.4",
6565
"left-pad": "^1.1.3",
6666
"lodash": "^4.17.4",
67-
"multihashes": "^0.4.9",
68-
"multihashing-async": "^0.4.6",
67+
"multihashes": "~0.4.12",
68+
"multihashing-async": "~0.4.7",
6969
"pull-batch": "^1.0.0",
70-
"pull-block": "^1.2.0",
70+
"pull-block": "1.2.0",
7171
"pull-cat": "^1.1.11",
7272
"pull-defer": "^0.2.2",
7373
"pull-pair": "^1.1.0",
7474
"pull-paramap": "^1.2.2",
7575
"pull-pause": "0.0.1",
7676
"pull-pushable": "^2.1.1",
77-
"pull-stream": "^3.6.0",
77+
"pull-stream": "^3.6.1",
7878
"pull-traverse": "^1.0.3",
7979
"pull-write": "^1.1.4",
8080
"sparse-array": "^1.3.1"
@@ -93,4 +93,4 @@
9393
"jbenet <[email protected]>",
9494
"nginnever <[email protected]>"
9595
]
96-
}
96+
}

test/test-builder.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ module.exports = (repo) => {
1818
describe('builder', () => {
1919
let ipldResolver
2020

21+
const testMultihashes = Object.keys(mh.names).slice(0, 40)
22+
2123
before(() => {
2224
const bs = new BlockService(repo)
2325
ipldResolver = new IPLDResolver(bs)
2426
})
2527

2628
it('allows multihash hash algorithm to be specified', (done) => {
27-
eachSeries(Object.keys(mh.names), (hashAlg, cb) => {
29+
eachSeries(testMultihashes, (hashAlg, cb) => {
2830
const options = { hashAlg, strategy: 'flat' }
2931
const content = String(Math.random() + Date.now())
3032
const inputFile = {
@@ -59,7 +61,7 @@ module.exports = (repo) => {
5961
})
6062

6163
it('allows multihash hash algorithm to be specified for big file', (done) => {
62-
eachSeries(Object.keys(mh.names), (hashAlg, cb) => {
64+
eachSeries(testMultihashes, (hashAlg, cb) => {
6365
const options = { hashAlg, strategy: 'flat' }
6466
const content = String(Math.random() + Date.now())
6567
const inputFile = {

test/test-fixed-size-chunker.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ const rawFile = loadFixture(__dirname, 'fixtures/1MiB.txt')
1212

1313
describe('chunker: fixed size', () => {
1414
it('chunks non flat buffers', (done) => {
15-
const b1 = new Buffer(2 * 256)
16-
const b2 = new Buffer(1 * 256)
17-
const b3 = new Buffer(5 * 256)
15+
const b1 = Buffer.alloc(2 * 256)
16+
const b2 = Buffer.alloc(1 * 256)
17+
const b3 = Buffer.alloc(5 * 256)
1818

1919
b1.fill('a')
2020
b2.fill('b')
@@ -36,7 +36,7 @@ describe('chunker: fixed size', () => {
3636

3737
it('256 Bytes chunks', (done) => {
3838
pull(
39-
pull.infinite(() => Buffer([1])),
39+
pull.infinite(() => Buffer.from('a')),
4040
pull.take(256 * 12),
4141
chunker(256),
4242
pull.collect((err, chunks) => {
@@ -69,7 +69,7 @@ describe('chunker: fixed size', () => {
6969

7070
it('256 KiB chunks of non scalar filesize', (done) => {
7171
const KiB256 = 262144
72-
let file = Buffer.concat([rawFile, new Buffer('hello')])
72+
let file = Buffer.concat([rawFile, Buffer.from('hello')])
7373

7474
pull(
7575
pull.values(file),

0 commit comments

Comments
 (0)