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

Commit b7fad99

Browse files
author
Alan Shaw
authored
test: add CID version agnostic tests (#413)
License: MIT Signed-off-by: Alan Shaw <[email protected]>
1 parent f54422d commit b7fad99

File tree

8 files changed

+218
-7
lines changed

8 files changed

+218
-7
lines changed

‎js/src/block/get.js

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,42 @@ module.exports = (createCommon, options) => {
7070
})
7171
})
7272

73-
// TODO it.skip('Promises support', (done) => {})
73+
it('should get a block added as CIDv0 with a CIDv1', done => {
74+
const input = Buffer.from(`TEST${Date.now()}`)
75+
76+
ipfs.block.put(input, { version: 0 }, (err, res) => {
77+
expect(err).to.not.exist()
78+
79+
const cidv0 = res.cid
80+
expect(cidv0.version).to.equal(0)
81+
82+
const cidv1 = cidv0.toV1()
83+
84+
ipfs.block.get(cidv1, (err, output) => {
85+
expect(err).to.not.exist()
86+
expect(output.data).to.eql(input)
87+
done()
88+
})
89+
})
90+
})
91+
92+
it('should get a block added as CIDv1 with a CIDv0', done => {
93+
const input = Buffer.from(`TEST${Date.now()}`)
94+
95+
ipfs.block.put(input, { version: 1 }, (err, res) => {
96+
expect(err).to.not.exist()
97+
98+
const cidv1 = res.cid
99+
expect(cidv1.version).to.equal(1)
100+
101+
const cidv0 = cidv1.toV0()
102+
103+
ipfs.block.get(cidv0, (err, output) => {
104+
expect(err).to.not.exist()
105+
expect(output.data).to.eql(input)
106+
done()
107+
})
108+
})
109+
})
74110
})
75111
}

‎js/src/dag/get.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const { series, eachSeries } = require('async')
55
const dagPB = require('ipld-dag-pb')
66
const DAGNode = dagPB.DAGNode
77
const dagCBOR = require('ipld-dag-cbor')
8+
const Unixfs = require('ipfs-unixfs')
9+
const CID = require('cids')
810
const { spawnNodeWithId } = require('../utils/spawn')
911
const { getDescribe, getIt, expect } = require('../utils/mocha')
1012

@@ -211,5 +213,45 @@ module.exports = (createCommon, options) => {
211213
done()
212214
})
213215
})
216+
217+
it('should get a node added as CIDv0 with a CIDv1', done => {
218+
const input = Buffer.from(`TEST${Date.now()}`)
219+
220+
dagPB.DAGNode.create(input, (err, node) => {
221+
expect(err).to.not.exist()
222+
223+
ipfs.dag.put(node, { format: 'dag-pb', hashAlg: 'sha2-256' }, (err, cid) => {
224+
expect(err).to.not.exist()
225+
expect(cid.version).to.equal(0)
226+
227+
const cidv1 = cid.toV1()
228+
229+
ipfs.dag.get(cidv1, (err, output) => {
230+
expect(err).to.not.exist()
231+
expect(output.value.data).to.eql(input)
232+
done()
233+
})
234+
})
235+
})
236+
})
237+
238+
it('should get a node added as CIDv1 with a CIDv0', done => {
239+
const input = Buffer.from(`TEST${Date.now()}`)
240+
241+
ipfs.add(input, { cidVersion: 1, rawLeaves: false }, (err, res) => {
242+
expect(err).to.not.exist()
243+
244+
const cidv1 = new CID(res[0].hash)
245+
expect(cidv1.version).to.equal(1)
246+
247+
const cidv0 = cidv1.toV0()
248+
249+
ipfs.dag.get(cidv0, (err, output) => {
250+
expect(err).to.not.exist()
251+
expect(Unixfs.unmarshal(output.value.data).data).to.eql(input)
252+
done()
253+
})
254+
})
255+
})
214256
})
215257
}

‎js/src/dht/findprovs.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
'use strict'
33

44
const multihashing = require('multihashing-async')
5-
const Crypto = require('crypto')
65
const waterfall = require('async/waterfall')
76
const CID = require('cids')
87
const { spawnNodesWithId } = require('../utils/spawn')
98
const { getDescribe, getIt, expect } = require('../utils/mocha')
109
const { connect } = require('../utils/swarm')
1110

1211
function fakeCid (cb) {
13-
const bytes = Crypto.randomBytes(Math.round(Math.random() * 1000))
12+
const bytes = Buffer.from(`TEST${Date.now()}`)
1413
multihashing(bytes, 'sha2-256', (err, mh) => {
1514
if (err) {
1615
cb(err)

‎js/src/files-regular/cat.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,44 @@ module.exports = (createCommon, options) => {
7676
})
7777
})
7878

79+
it('should cat a file added as CIDv0 with a CIDv1', done => {
80+
const input = Buffer.from(`TEST${Date.now()}`)
81+
82+
ipfs.add(input, { cidVersion: 0 }, (err, res) => {
83+
expect(err).to.not.exist()
84+
85+
const cidv0 = new CID(res[0].hash)
86+
expect(cidv0.version).to.equal(0)
87+
88+
const cidv1 = cidv0.toV1()
89+
90+
ipfs.cat(cidv1, (err, output) => {
91+
expect(err).to.not.exist()
92+
expect(output).to.eql(input)
93+
done()
94+
})
95+
})
96+
})
97+
98+
it('should cat a file added as CIDv1 with a CIDv0', done => {
99+
const input = Buffer.from(`TEST${Date.now()}`)
100+
101+
ipfs.add(input, { cidVersion: 1, rawLeaves: false }, (err, res) => {
102+
expect(err).to.not.exist()
103+
104+
const cidv1 = new CID(res[0].hash)
105+
expect(cidv1.version).to.equal(1)
106+
107+
const cidv0 = cidv1.toV0()
108+
109+
ipfs.cat(cidv0, (err, output) => {
110+
expect(err).to.not.exist()
111+
expect(output).to.eql(input)
112+
done()
113+
})
114+
})
115+
})
116+
79117
it('should cat a BIG file', (done) => {
80118
ipfs.cat(fixtures.bigFile.cid, (err, data) => {
81119
expect(err).to.not.exist()

‎js/src/files-regular/get.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const { fixtures } = require('./utils')
55
const bs58 = require('bs58')
66
const parallel = require('async/parallel')
77
const series = require('async/series')
8+
const CID = require('cids')
89
const { getDescribe, getIt, expect } = require('../utils/mocha')
910

1011
module.exports = (createCommon, options) => {
@@ -73,6 +74,44 @@ module.exports = (createCommon, options) => {
7374
})
7475
})
7576

77+
it('should get a file added as CIDv0 with a CIDv1', done => {
78+
const input = Buffer.from(`TEST${Date.now()}`)
79+
80+
ipfs.add(input, { cidVersion: 0 }, (err, res) => {
81+
expect(err).to.not.exist()
82+
83+
const cidv0 = new CID(res[0].hash)
84+
expect(cidv0.version).to.equal(0)
85+
86+
const cidv1 = cidv0.toV1()
87+
88+
ipfs.get(cidv1, (err, output) => {
89+
expect(err).to.not.exist()
90+
expect(output[0].content).to.eql(input)
91+
done()
92+
})
93+
})
94+
})
95+
96+
it('should get a file added as CIDv1 with a CIDv0', done => {
97+
const input = Buffer.from(`TEST${Date.now()}`)
98+
99+
ipfs.add(input, { cidVersion: 1, rawLeaves: false }, (err, res) => {
100+
expect(err).to.not.exist()
101+
102+
const cidv1 = new CID(res[0].hash)
103+
expect(cidv1.version).to.equal(1)
104+
105+
const cidv0 = cidv1.toV0()
106+
107+
ipfs.get(cidv0, (err, output) => {
108+
expect(err).to.not.exist()
109+
expect(output[0].content).to.eql(input)
110+
done()
111+
})
112+
})
113+
})
114+
76115
it('should get a BIG file', (done) => {
77116
ipfs.get(fixtures.bigFile.cid, (err, files) => {
78117
expect(err).to.not.exist()

‎js/src/files-regular/ls.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
const { fixtures } = require('./utils')
55
const { getDescribe, getIt, expect } = require('../utils/mocha')
6+
const CID = require('cids')
67

78
module.exports = (createCommon, options) => {
89
const describe = getDescribe(options)
@@ -104,6 +105,62 @@ module.exports = (createCommon, options) => {
104105
})
105106
})
106107

108+
it('should ls files added as CIDv0 with a CIDv1', done => {
109+
const randomName = prefix => `${prefix}${Math.round(Math.random() * 1000)}`
110+
const dir = randomName('DIR')
111+
112+
const input = [
113+
{ path: `${dir}/${randomName('F0')}`, content: Buffer.from(randomName('D0')) },
114+
{ path: `${dir}/${randomName('F1')}`, content: Buffer.from(randomName('D1')) }
115+
]
116+
117+
ipfs.add(input, { cidVersion: 0 }, (err, res) => {
118+
expect(err).to.not.exist()
119+
120+
const cidv0 = new CID(res[res.length - 1].hash)
121+
expect(cidv0.version).to.equal(0)
122+
123+
const cidv1 = cidv0.toV1()
124+
125+
ipfs.ls(cidv1, (err, output) => {
126+
expect(err).to.not.exist()
127+
expect(output.length).to.equal(input.length)
128+
output.forEach(({ hash }) => {
129+
expect(res.find(file => file.hash === hash)).to.exist()
130+
})
131+
done()
132+
})
133+
})
134+
})
135+
136+
it('should ls files added as CIDv1 with a CIDv0', done => {
137+
const randomName = prefix => `${prefix}${Math.round(Math.random() * 1000)}`
138+
const dir = randomName('DIR')
139+
140+
const input = [
141+
{ path: `${dir}/${randomName('F0')}`, content: Buffer.from(randomName('D0')) },
142+
{ path: `${dir}/${randomName('F1')}`, content: Buffer.from(randomName('D1')) }
143+
]
144+
145+
ipfs.add(input, { cidVersion: 1, rawLeaves: false }, (err, res) => {
146+
expect(err).to.not.exist()
147+
148+
const cidv1 = new CID(res[res.length - 1].hash)
149+
expect(cidv1.version).to.equal(1)
150+
151+
const cidv0 = cidv1.toV1()
152+
153+
ipfs.ls(cidv0, (err, output) => {
154+
expect(err).to.not.exist()
155+
expect(output.length).to.equal(input.length)
156+
output.forEach(({ hash }) => {
157+
expect(res.find(file => file.hash === hash)).to.exist()
158+
})
159+
done()
160+
})
161+
})
162+
})
163+
107164
it('should correctly handle a non existing hash', (done) => {
108165
ipfs.ls('surelynotavalidhashheh?', (err, res) => {
109166
expect(err).to.exist()

‎js/src/object/get.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const series = require('async/series')
77
const hat = require('hat')
88
const { getDescribe, getIt, expect } = require('../utils/mocha')
99
const UnixFs = require('ipfs-unixfs')
10-
const crypto = require('crypto')
10+
const randomBytes = require('randombytes')
1111
const { asDAGLink } = require('./utils')
1212

1313
module.exports = (createCommon, options) => {
@@ -326,7 +326,7 @@ module.exports = (createCommon, options) => {
326326
let next = maxBytes
327327

328328
while (data.length !== required) {
329-
data = Buffer.concat([data, crypto.randomBytes(next)])
329+
data = Buffer.concat([data, randomBytes(next)])
330330
next = maxBytes
331331

332332
if (data.length + maxBytes > required) {

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"chai": "^4.2.0",
4444
"cids": "~0.5.5",
4545
"concat-stream": "^1.6.2",
46-
"crypto": "^1.0.1",
4746
"dirty-chai": "^2.0.1",
4847
"es6-promisify": "^6.0.1",
4948
"hat": "0.0.3",
@@ -62,7 +61,8 @@
6261
"peer-id": "~0.12.0",
6362
"peer-info": "~0.15.0",
6463
"pull-stream": "^3.6.9",
65-
"pump": "^3.0.0"
64+
"pump": "^3.0.0",
65+
"randombytes": "^2.0.6"
6666
},
6767
"devDependencies": {
6868
"aegir": "^17.0.1"

0 commit comments

Comments
 (0)