Skip to content
This repository has been archived by the owner on Aug 11, 2021. It is now read-only.

[WIP] refactor: use CIDv1 by default #115

Closed
wants to merge 2 commits into from
Closed

[WIP] refactor: use CIDv1 by default #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1050268
refactor: use CIDv1 by default
Feb 7, 2019
63e9f56
test: add test for calculate v0 CID
Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"async": "^2.6.1",
"bs58": "^4.0.1",
"cids": "~0.5.4",
"cids": "github:multiformats/js-cid#refactor/cidv1base32-default",
"class-is": "^1.1.0",
"is-ipfs": "~0.4.2",
"multihashing-async": "~0.5.1",
Expand Down
8 changes: 3 additions & 5 deletions src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports = module.exports
*
* @param {Object} dagNode - Internal representation
* @param {Object} [options] - Options to create the CID
* @param {number} [options.version] - CID version number. Defaults to zero if hashAlg == 'sha2-256'; otherwise, 1.
* @param {number} [options.version] - CID version number. Defaults to 1.
* @param {string} [options.hashAlg] - Defaults to hashAlg for the resolver
* @param {CidCallback} callback - Callback that handles the return value
* @returns {void}
Expand All @@ -33,10 +33,8 @@ function cid (dagNode, options, callback) {
}
options = options || {}
const hashAlg = options.hashAlg || resolver.defaultHashAlg
let version = options.version
if (typeof version === 'undefined') {
version = hashAlg === 'sha2-256' ? 0 : 1
}
const version = options.version == null ? 1 : options.version

waterfall([
(cb) => {
if (Buffer.isBuffer(dagNode)) {
Expand Down
6 changes: 3 additions & 3 deletions test/dag-node-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ module.exports = (repo) => {
expect(err).to.not.exist()
expect(cid.multihash).to.exist()
expect(cid.codec).to.equal('dag-pb')
expect(cid.version).to.equal(0)
expect(cid.version).to.equal(1)
const mh = multihash.decode(cid.multihash)
expect(mh.name).to.equal('sha2-256')
done()
Expand Down Expand Up @@ -532,7 +532,7 @@ module.exports = (repo) => {

dagPB.util.cid(node, (err, cid) => {
expect(err).to.not.exist()
expect(cid.toBaseEncodedString()).to.eql('QmQqy2SiEkKgr2cw5UbQ93TtLKEMsD8TdcWggR8q9JabjX')
expect(cid.toBaseEncodedString()).to.eql('bafybeibfhhww5bpsu34qs7nz25wp7ve36mcc5mxd5du26sr45bbnjhpkei')
done()
})
})
Expand Down Expand Up @@ -571,7 +571,7 @@ module.exports = (repo) => {

dagPB.util.cid(node, (err, cid) => {
expect(err).to.not.exist()
expect(cid.toBaseEncodedString()).to.eql('QmbSAC58x1tsuPBAoarwGuTQAgghKvdbKSBC8yp5gKCj5M')
expect(cid.toBaseEncodedString()).to.eql('bafybeigcsevw74ssldzfwhiijzmg7a35lssfmjkuoj2t5qs5u5aztj47tq')
done()
})
})
Expand Down