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

Commit c82b089

Browse files
achingbrainachingbrain
committed
chore: use same hashes as go
ipfs-inactive/js-ipfs-unixfs-engine#214 changes the algorithm used when adding files to be more consistent with the go implementation. This means some generated hashes will change. This PR updates those hashes in our test suite.
1 parent 2e40fb8 commit c82b089

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎test/cli/file.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
const expect = require('chai').expect
55
const runOnAndOff = require('../utils/on-and-off')
66
const file = 'QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV'
7-
const dir = 'QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2'
7+
const dir = 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z'
88

99
describe('file ls', () => runOnAndOff((thing) => {
1010
let ipfs
@@ -27,9 +27,9 @@ describe('file ls', () => runOnAndOff((thing) => {
2727
return ipfs(`file ls ${dir}`)
2828
.then((out) => expect(out).to.eql(
2929
`This functionality is deprecated, and will be removed in future versions. If possible, please use 'ipfs ls' instead.\n` +
30-
'QmQQHYDwAQms78fPcvx1uFFsfho23YJNoewfLbi9AtdyJ9\n' +
30+
'QmamKEPmEH9RUsqRQsfNf5evZQDQPYL9KXg1ADeT7mkHkT\n' +
3131
'QmPkWYfSLCEBLZu7BZt4kigGDMe3cpogMbeVf97gN2xJDN\n' +
32-
'Qma13ZrhKG52MWnwtZ6fMD8jGj8d4Q9sJgn5xtKgeZw5uz\n' +
32+
'QmUqyZtPmsRy1U5Mo8kz2BAMmk1hfJ7yW1KAFTMB2odsFv\n' +
3333
'QmUhUuiTKkkK8J6JZ9zmj8iNHPuNfGYcszgRumzhHBxEEU\n' +
3434
'QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV\n'
3535
))

‎test/cli/files.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ describe('files', () => runOnAndOff((thing) => {
4444
'added QmeiTxVN4xAjxUzHzBqCpK3GaT3GeiLQeJRpYDXDfLeEmR recursive-get-dir/datastore/MANIFEST-000014',
4545
'added QmQpc75sJGUv59dAwHF7vazBGV9o6C7z587Dp9nv7HYAps recursive-get-dir/datastore/LOG.old',
4646
'added QmbFNLNr9at9eK5LrNyUdyE5cdLb5yaT9DkjXw7BK68kcM recursive-get-dir/datastore/LOG',
47-
'added QmfJMCvenrj4SKKRc48DYPxwVdS44qCUCqqtbqhJuSTWXP recursive-get-dir/datastore/LOCK',
47+
'added QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH recursive-get-dir/datastore/LOCK',
4848
'added QmVJi93Yj5RW3NuqqxonGz3jAXUYHrdQvWrURxg1TiLEuX recursive-get-dir/datastore/CURRENT',
4949
'added QmcJ6TXPMPm6puSC9vpxuG57PyfGpr8bvTgkKU9SHHU5Uo recursive-get-dir/datastore/000010.ldb',
5050
'added QmPFVLPmp9zv5Z5KUqLhe2EivAGccQW2r7M7jhVJGLZoZU recursive-get-dir/datastore/000005.ldb',
5151
'added QmfExFwdFKspsY2q5WnhQjd1QDKnjpTQ4UkiHqqQxV7h67 recursive-get-dir/datastore/000002.ldb',
52-
'added Qma13ZrhKG52MWnwtZ6fMD8jGj8d4Q9sJgn5xtKgeZw5uz recursive-get-dir/datastore',
52+
'added QmUqyZtPmsRy1U5Mo8kz2BAMmk1hfJ7yW1KAFTMB2odsFv recursive-get-dir/datastore',
5353
'added QmPkWYfSLCEBLZu7BZt4kigGDMe3cpogMbeVf97gN2xJDN recursive-get-dir/config',
5454
'added QmbJgQa4XNBFvGQcLbWBNtvWZetbCUKiyAQNfePoTzwf9L recursive-get-dir/blocks/CIQPD/CIQPDQJBGYDZNMOAGGYNRNMP2VDKWBWGAEDDEJDACM3SGG3VIANDDXI.data',
5555
'added QmSCUPYy4CfFt9nA61J9v2DMfJygQAJjaUcRmygDbVME2D recursive-get-dir/blocks/CIQPD',
@@ -61,8 +61,8 @@ describe('files', () => runOnAndOff((thing) => {
6161
'added Qmec4atiyfysPR8HU5gPfjKY1NpQDY2kmSeeadx8wLEBqY recursive-get-dir/blocks/CIQOM',
6262
'added QmeBypQ2yE4t4Loybhby15DjkeLDXJKCcgMfxTXeFnHa8F recursive-get-dir/blocks/CIQOL/CIQOLBQZSZAODJGGH6RYYVBUXHTS3SM5EORZDU63LYPEFUAFE4SBM4I.data',
6363
'added Qmd6s8LXAEjW7y9QbGSzeuewrRBYjJHmcazG3Hk7cJ74da recursive-get-dir/blocks/CIQOL',
64-
'added QmfJMCvenrj4SKKRc48DYPxwVdS44qCUCqqtbqhJuSTWXP recursive-get-dir/blocks/CIQOH/CIQOHMGEIKMPYHAUTL57JSEZN64SIJ5OIHSGJG4TJSSJLGI3PBJLQVI.data',
65-
'added QmdiJnDhn4Bb1odByw1BA5qpXssjxgttVz42tpEfo7HNUe recursive-get-dir/blocks/CIQOH',
64+
'added QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH recursive-get-dir/blocks/CIQOH/CIQOHMGEIKMPYHAUTL57JSEZN64SIJ5OIHSGJG4TJSSJLGI3PBJLQVI.data',
65+
'added QmTnaav9VTSVyLu8PvRzh4gJ8heF9rpdWzeDb7rMx5DkxV recursive-get-dir/blocks/CIQOH',
6666
'added Qmc1nasezDdPyZiXB5VB6Aygzswcr6QkauzzXMeUGouHTN recursive-get-dir/blocks/CIQMB/CIQMB7DLJFKD267QJ2B5FJNHZPTSVA7IB6OHXSQ2XSVEEKMKK6RT75I.data',
6767
'added QmeqJBkwmzsVR79HBKLW7AYhfAMxMaJs5dGHSgey5ezy7N recursive-get-dir/blocks/CIQMB',
6868
'added QmaSjzSSRanYzRGPXQY6m5SWfSkkfcnzNkurJEQc4chPJx recursive-get-dir/blocks/CIQLB/CIQLBS5HG4PRCRQ7O4EBXFD5QN6MTI5YBYMCVQJDXPKCOVR6RMLHZFQ.data',
@@ -113,8 +113,8 @@ describe('files', () => runOnAndOff((thing) => {
113113
'added QmSCq2peGvGDXZKuX565UczxRpgzsiPPF3PgcJq9zDbByL recursive-get-dir/blocks/CIQDD',
114114
'added QmdgaiKe1HFfhrZvLwTFCrXmgTojhSWuBvyFXUVc8KzJVc recursive-get-dir/blocks/CIQBE/CIQBED3K6YA5I3QQWLJOCHWXDRK5EXZQILBCKAPEDUJENZ5B5HJ5R3A.data',
115115
'added QmYwUkwNwJN2cevwXKL48DRpbbjbdLWyyLANG3BKTtsTZ8 recursive-get-dir/blocks/CIQBE',
116-
'added QmQQHYDwAQms78fPcvx1uFFsfho23YJNoewfLbi9AtdyJ9 recursive-get-dir/blocks',
117-
'added QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2 recursive-get-dir'
116+
'added QmamKEPmEH9RUsqRQsfNf5evZQDQPYL9KXg1ADeT7mkHkT recursive-get-dir/blocks',
117+
'added Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z recursive-get-dir'
118118
]
119119

120120
before(() => {
@@ -144,7 +144,7 @@ describe('files', () => runOnAndOff((thing) => {
144144
it('add alias', function () {
145145
this.timeout(30 * 1000)
146146

147-
return ipfs('add src/init-files/init-docs/readme')
147+
return ipfs('files add src/init-files/init-docs/readme')
148148
.then((out) => {
149149
expect(out)
150150
.to.eql('added QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB readme\n')
@@ -186,7 +186,7 @@ describe('files', () => runOnAndOff((thing) => {
186186
it('add and wrap with a directory', function () {
187187
this.timeout(30 * 1000)
188188

189-
return ipfs('add -w src/init-files/init-docs/readme').then((out) => {
189+
return ipfs('files add -w src/init-files/init-docs/readme').then((out) => {
190190
expect(out).to.be.eql([
191191
'added QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB readme',
192192
'added QmapdaVPjHXdcswef82FnGQUauMNpk9xYFkLDZKgAxhMwq'
@@ -197,7 +197,7 @@ describe('files', () => runOnAndOff((thing) => {
197197
it('add with cid-version=0', function () {
198198
this.timeout(30 * 1000)
199199

200-
return ipfs('add src/init-files/init-docs/readme --cid-version=0').then((out) => {
200+
return ipfs('files add src/init-files/init-docs/readme --cid-version=0').then((out) => {
201201
expect(out)
202202
.to.eql('added QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB readme\n')
203203
})
@@ -216,7 +216,7 @@ describe('files', () => runOnAndOff((thing) => {
216216
this.timeout(30 * 1000)
217217

218218
return new Promise((resolve, reject) => {
219-
ipfs('add src/init-files/init-docs/readme --cid-version=1')
219+
ipfs('files add src/init-files/init-docs/readme --cid-version=1')
220220
.then(() => reject(new Error('Raw leaves not expected to be implemented')))
221221
.catch((err) => {
222222
expect(err).to.exist()
@@ -227,7 +227,7 @@ describe('files', () => runOnAndOff((thing) => {
227227

228228
// TODO: this test is failing, @alanshaw?
229229
it.skip('add with cid-version=1 and raw-leaves=false', () => {
230-
return ipfs('add src/init-files/init-docs/readme --cid-version=1 --raw-leaves=false').then((out) => {
230+
return ipfs('files add src/init-files/init-docs/readme --cid-version=1 --raw-leaves=false').then((out) => {
231231
expect(out)
232232
.to.eql('added zdj7WWeQ43G6JJvLWQWZpyHuAMq6uYWRjkBXFad11vE2LHhQ7 readme\n')
233233
})
@@ -246,7 +246,7 @@ describe('files', () => runOnAndOff((thing) => {
246246
this.timeout(30 * 1000)
247247

248248
return new Promise((resolve, reject) => {
249-
ipfs('add src/init-files/init-docs/readme --cid-version=1 --raw-leaves=true')
249+
ipfs('files add src/init-files/init-docs/readme --cid-version=1 --raw-leaves=true')
250250
.then(() => reject(new Error('Raw leaves not expected to be implemented')))
251251
.catch((err) => {
252252
expect(err).to.exist()
@@ -330,7 +330,7 @@ describe('files', () => runOnAndOff((thing) => {
330330
it('cat', function () {
331331
this.timeout(30 * 1000)
332332

333-
return ipfs('files cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
333+
return ipfs('cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
334334
.then((out) => {
335335
expect(out).to.eql(readme)
336336
})
@@ -348,7 +348,7 @@ describe('files', () => runOnAndOff((thing) => {
348348
it('cat part of a file using `count`', function () {
349349
this.timeout(30 * 1000)
350350

351-
return ipfs('files cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB --offset 21 --count 5')
351+
return ipfs('cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB --offset 21 --count 5')
352352
.then((out) => {
353353
expect(out).to.eql(readme.substring(21, 26))
354354
})
@@ -357,7 +357,7 @@ describe('files', () => runOnAndOff((thing) => {
357357
it('cat part of a file using `length`', function () {
358358
this.timeout(30 * 1000)
359359

360-
return ipfs('files cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB --offset 21 --length 5')
360+
return ipfs('cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB --offset 21 --length 5')
361361
.then((out) => {
362362
expect(out).to.eql(readme.substring(21, 26))
363363
})
@@ -390,7 +390,7 @@ describe('files', () => runOnAndOff((thing) => {
390390
it('get alias', function () {
391391
this.timeout(20 * 1000)
392392

393-
return ipfs('get QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
393+
return ipfs('files get QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
394394
.then((out) => {
395395
expect(out)
396396
.to.eql('Saving file(s) QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB\n')
@@ -406,16 +406,16 @@ describe('files', () => runOnAndOff((thing) => {
406406
it('get recursively', function () {
407407
this.timeout(20 * 1000)
408408

409-
const outDir = path.join(process.cwd(), 'QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2')
409+
const outDir = path.join(process.cwd(), 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z')
410410
rimraf(outDir)
411411

412-
return ipfs('files get QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2')
412+
return ipfs('files get Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z')
413413
.then((out) => {
414414
expect(out).to.eql(
415-
'Saving file(s) QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2\n'
415+
'Saving file(s) Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z\n'
416416
)
417417

418-
const outDir = path.join(process.cwd(), 'QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2')
418+
const outDir = path.join(process.cwd(), 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z')
419419
const expectedDir = path.join(process.cwd(), 'test', 'fixtures', 'test-data', 'recursive-get-dir')
420420

421421
const compareResult = compareDir(outDir, expectedDir, {

‎test/cli/ls.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ describe('ls', () => runOnAndOff((thing) => {
1414

1515
it('prints added files', function () {
1616
this.timeout(20 * 1000)
17-
return ipfs('ls QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2')
17+
return ipfs('ls Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z')
1818
.then((out) => {
1919
expect(out).to.eql(
20-
'QmQQHYDwAQms78fPcvx1uFFsfho23YJNoewfLbi9AtdyJ9 123530 blocks/\n' +
20+
'QmamKEPmEH9RUsqRQsfNf5evZQDQPYL9KXg1ADeT7mkHkT 123530 blocks/\n' +
2121
'QmPkWYfSLCEBLZu7BZt4kigGDMe3cpogMbeVf97gN2xJDN 3939 config\n' +
22-
'Qma13ZrhKG52MWnwtZ6fMD8jGj8d4Q9sJgn5xtKgeZw5uz 5503 datastore/\n' +
22+
'QmUqyZtPmsRy1U5Mo8kz2BAMmk1hfJ7yW1KAFTMB2odsFv 5503 datastore/\n' +
2323
'QmUhUuiTKkkK8J6JZ9zmj8iNHPuNfGYcszgRumzhHBxEEU 7397 init-docs/\n' +
2424
'QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV 10 version\n'
2525
)
@@ -38,13 +38,13 @@ describe('ls', () => runOnAndOff((thing) => {
3838

3939
it('adds a header, -v', function () {
4040
this.timeout(20 * 1000)
41-
return ipfs('ls /ipfs/QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2 -v')
41+
return ipfs('ls /ipfs/Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z -v')
4242
.then((out) => {
4343
expect(out).to.eql(
4444
'Hash Size Name\n' +
45-
'QmQQHYDwAQms78fPcvx1uFFsfho23YJNoewfLbi9AtdyJ9 123530 blocks/\n' +
45+
'QmamKEPmEH9RUsqRQsfNf5evZQDQPYL9KXg1ADeT7mkHkT 123530 blocks/\n' +
4646
'QmPkWYfSLCEBLZu7BZt4kigGDMe3cpogMbeVf97gN2xJDN 3939 config\n' +
47-
'Qma13ZrhKG52MWnwtZ6fMD8jGj8d4Q9sJgn5xtKgeZw5uz 5503 datastore/\n' +
47+
'QmUqyZtPmsRy1U5Mo8kz2BAMmk1hfJ7yW1KAFTMB2odsFv 5503 datastore/\n' +
4848
'QmUhUuiTKkkK8J6JZ9zmj8iNHPuNfGYcszgRumzhHBxEEU 7397 init-docs/\n' +
4949
'QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV 10 version\n'
5050
)
@@ -54,7 +54,7 @@ describe('ls', () => runOnAndOff((thing) => {
5454
it('follows a path, <hash>/<subdir>', function () {
5555
this.timeout(20 * 1000)
5656

57-
return ipfs('ls /ipfs/QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2/init-docs')
57+
return ipfs('ls /ipfs/Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z/init-docs')
5858
.then((out) => {
5959
expect(out).to.eql(
6060
'QmZTR5bcpQD7cFgTorqxZDYaew1Wqgfbd2ud9QqGPAkK2V 1688 about\n' +
@@ -73,7 +73,7 @@ describe('ls', () => runOnAndOff((thing) => {
7373
this.slow(2000)
7474
this.timeout(20 * 1000)
7575

76-
return ipfs('ls -r /ipfs/QmYmW4HiZhotsoSqnv2o1oUusvkRM8b9RweBoH7ao5nki2/init-docs')
76+
return ipfs('ls -r /ipfs/Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z/init-docs')
7777
.then(out => {
7878
expect(out).to.eql(
7979
'QmZTR5bcpQD7cFgTorqxZDYaew1Wqgfbd2ud9QqGPAkK2V 1688 about\n' +

0 commit comments

Comments
 (0)