From 42dd425e6431509ee9934465607a90da1a36afff Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 13 Jul 2017 01:19:02 -0700 Subject: [PATCH 1/9] add base2/bin noop resolver --- src/index.js | 5 +++++ src/ipldBin.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/ipldBin.js diff --git a/src/index.js b/src/index.js index 078b0cb..7d0792f 100644 --- a/src/index.js +++ b/src/index.js @@ -23,6 +23,7 @@ const ipldEthStateTrie = require('ipld-eth-star').ethStateTrie const ipldEthStorageTrie = require('ipld-eth-star').ethStorageTrie const ipldEthTx = require('ipld-eth-star').ethTx const ipldEthTxTrie = require('ipld-eth-star').ethTxTrie +const ipldBin = require('./ipldBin') function noop () {} @@ -91,6 +92,10 @@ class IPLDResolver { this.support.add(ipldEthTxTrie.resolver.multicodec, ipldEthTxTrie.resolver, ipldEthTxTrie.util) + + this.support.add(ipldBin.resolver.multicodec, + ipldBin.resolver, + ipldBin.util) } get (cid, path, options, callback) { diff --git a/src/ipldBin.js b/src/ipldBin.js new file mode 100644 index 0000000..02e7549 --- /dev/null +++ b/src/ipldBin.js @@ -0,0 +1,29 @@ +'use strict' +const CID = require('cids') + +// binary resolver +module.exports = { + resolver: { + multicodec: 'base2', + resolve: (ipfsBlock, path, callback) => { + callback(null, { + value: ipfsBlock.data, + remainderPath: path + }) + }, + tree: (ipfsBlock, options, callback) => { + callback(null, []) + } + }, + util: { + deserialize: (data, cb) => { + cb(null, data) + }, + serialize: (data, cb) => { + cb(null, data) + }, + cid: (data, cb) => { + cb(null, new CID(1, 'base2', data)) + } + } +} From a70470061250ada1e8da66272e733d36fc761d81 Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 13 Jul 2017 02:00:53 -0700 Subject: [PATCH 2/9] tests - add test for ipldBin --- test/browser.js | 1 + test/ipld-bin.js | 28 ++++++++++++++++++++++++++++ test/node.js | 1 + 3 files changed, 30 insertions(+) create mode 100644 test/ipld-bin.js diff --git a/test/browser.js b/test/browser.js index eb8f507..49aa330 100644 --- a/test/browser.js +++ b/test/browser.js @@ -37,6 +37,7 @@ describe('Browser', () => { ], done) }) + require('./ipld-bin') require('./basics')(repo) require('./ipld-dag-pb')(repo) require('./ipld-dag-cbor')(repo) diff --git a/test/ipld-bin.js b/test/ipld-bin.js new file mode 100644 index 0000000..74be789 --- /dev/null +++ b/test/ipld-bin.js @@ -0,0 +1,28 @@ +/* eslint-env mocha */ +'use strict' + +const chai = require('chai') +const dirtyChai = require('dirty-chai') +const expect = chai.expect +chai.use(dirtyChai) +const IpfsBlock = require('ipfs-block') +const CID = require('cids') +const ipldBin = require('../src/ipldBin') + +module.exports = () => { + describe('IPLD Resolver with ipld-bin (binary resolver)', () => { + it('resolves an ipfsBlock to its data', (done) => { + const buffer = Buffer.from('deadbeef', 'hex') + const cid = new CID('zDvjKAA4iXx') + const ipfsBlock = new IpfsBlock(buffer, cid) + ipldBin.resolver.resolve(ipfsBlock, '/hello/world', (err, result) => { + expect(err).to.not.exist() + expect(result).to.exist() + expect(Buffer.isBuffer(result.value)).to.be.true() + expect(result.value.toString('hex')).to.be.eql('deadbeef') + expect(result.remainderPath).to.be.eql('/hello/world') + done() + }) + }) + }) +} diff --git a/test/node.js b/test/node.js index 21a74ae..3e4d70b 100644 --- a/test/node.js +++ b/test/node.js @@ -26,6 +26,7 @@ describe('Node.js', () => { ], done) }) + require('./ipld-bin') require('./basics')(repo) require('./ipld-dag-pb')(repo) require('./ipld-dag-cbor')(repo) From e011e0c20faa3096ac9312df3b5271d8e7bdb847 Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 13 Jul 2017 02:19:16 -0700 Subject: [PATCH 3/9] tests - improve ipldBin test coverage --- test/ipld-bin.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/test/ipld-bin.js b/test/ipld-bin.js index 74be789..b491e03 100644 --- a/test/ipld-bin.js +++ b/test/ipld-bin.js @@ -24,5 +24,53 @@ module.exports = () => { done() }) }) + + it('trees an empty array', (done) => { + const buffer = Buffer.from('deadbeef', 'hex') + const cid = new CID('zDvjKAA4iXx') + const ipfsBlock = new IpfsBlock(buffer, cid) + ipldBin.resolver.tree(ipfsBlock, {}, (err, result) => { + expect(err).to.not.exist() + expect(result).to.exist() + expect(result.length).to.eql(0) + done() + }) + }) + + it('creates a cid with the currect multicodec', (done) => { + const buffer = Buffer.from('deadbeef', 'hex') + // const cid = new CID('zDvjKAA4iXx') + // const ipfsBlock = new IpfsBlock(buffer, cid) + ipldBin.util.cid(buffer, (err, cid) => { + expect(err).to.not.exist() + expect(cid).to.exist() + expect(cid.codec).to.eql('base2') + done() + }) + }) + + it('serializes to the same value', (done) => { + const buffer = Buffer.from('deadbeef', 'hex') + // const cid = new CID('zDvjKAA4iXx') + // const ipfsBlock = new IpfsBlock(buffer, cid) + ipldBin.util.serialize(buffer, (err, result) => { + expect(err).to.not.exist() + expect(result).to.exist() + expect(result.toString('hex')).to.eql(buffer.toString('hex')) + done() + }) + }) + + it('deserializes to the same value', (done) => { + const buffer = Buffer.from('deadbeef', 'hex') + // const cid = new CID('zDvjKAA4iXx') + // const ipfsBlock = new IpfsBlock(buffer, cid) + ipldBin.util.deserialize(buffer, (err, result) => { + expect(err).to.not.exist() + expect(result).to.exist() + expect(result.toString('hex')).to.eql(buffer.toString('hex')) + done() + }) + }) }) } From 7baa91ce4014e9269f69030eb20c39760350211e Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 4 Oct 2017 14:57:30 -0700 Subject: [PATCH 4/9] use ipld-raw raw binary resolver --- package.json | 3 +- src/index.js | 8 ++--- src/ipldBin.js | 29 ------------------ test/ipld-bin.js | 76 ------------------------------------------------ test/node.js | 1 - 5 files changed, 6 insertions(+), 111 deletions(-) delete mode 100644 src/ipldBin.js delete mode 100644 test/ipld-bin.js diff --git a/package.json b/package.json index 447cfbd..cccf516 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "ipld-dag-pb": "~0.11.2", "ipld-eth-star": "^1.4.1", "ipld-git": "^0.1.0", + "ipld-raw": "^1.0.1", "is-ipfs": "~0.3.0", "lodash.flatten": "^4.4.0", "lodash.includes": "^4.3.0", @@ -75,4 +76,4 @@ "wanderer ", "Łukasz Magiera " ] -} \ No newline at end of file +} diff --git a/src/index.js b/src/index.js index f1ade6c..e02e238 100644 --- a/src/index.js +++ b/src/index.js @@ -24,7 +24,7 @@ const ipldEthStateTrie = require('ipld-eth-star').ethStateTrie const ipldEthStorageTrie = require('ipld-eth-star').ethStorageTrie const ipldEthTx = require('ipld-eth-star').ethTx const ipldEthTxTrie = require('ipld-eth-star').ethTxTrie -const ipldBin = require('./ipldBin') +const ipldRaw = require('ipld-raw') function noop () {} @@ -98,9 +98,9 @@ class IPLDResolver { ipldEthTxTrie.resolver, ipldEthTxTrie.util) - this.support.add(ipldBin.resolver.multicodec, - ipldBin.resolver, - ipldBin.util) + this.support.add(ipldRaw.resolver.multicodec, + ipldRaw.resolver, + ipldRaw.util) } get (cid, path, options, callback) { diff --git a/src/ipldBin.js b/src/ipldBin.js deleted file mode 100644 index 02e7549..0000000 --- a/src/ipldBin.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict' -const CID = require('cids') - -// binary resolver -module.exports = { - resolver: { - multicodec: 'base2', - resolve: (ipfsBlock, path, callback) => { - callback(null, { - value: ipfsBlock.data, - remainderPath: path - }) - }, - tree: (ipfsBlock, options, callback) => { - callback(null, []) - } - }, - util: { - deserialize: (data, cb) => { - cb(null, data) - }, - serialize: (data, cb) => { - cb(null, data) - }, - cid: (data, cb) => { - cb(null, new CID(1, 'base2', data)) - } - } -} diff --git a/test/ipld-bin.js b/test/ipld-bin.js deleted file mode 100644 index b491e03..0000000 --- a/test/ipld-bin.js +++ /dev/null @@ -1,76 +0,0 @@ -/* eslint-env mocha */ -'use strict' - -const chai = require('chai') -const dirtyChai = require('dirty-chai') -const expect = chai.expect -chai.use(dirtyChai) -const IpfsBlock = require('ipfs-block') -const CID = require('cids') -const ipldBin = require('../src/ipldBin') - -module.exports = () => { - describe('IPLD Resolver with ipld-bin (binary resolver)', () => { - it('resolves an ipfsBlock to its data', (done) => { - const buffer = Buffer.from('deadbeef', 'hex') - const cid = new CID('zDvjKAA4iXx') - const ipfsBlock = new IpfsBlock(buffer, cid) - ipldBin.resolver.resolve(ipfsBlock, '/hello/world', (err, result) => { - expect(err).to.not.exist() - expect(result).to.exist() - expect(Buffer.isBuffer(result.value)).to.be.true() - expect(result.value.toString('hex')).to.be.eql('deadbeef') - expect(result.remainderPath).to.be.eql('/hello/world') - done() - }) - }) - - it('trees an empty array', (done) => { - const buffer = Buffer.from('deadbeef', 'hex') - const cid = new CID('zDvjKAA4iXx') - const ipfsBlock = new IpfsBlock(buffer, cid) - ipldBin.resolver.tree(ipfsBlock, {}, (err, result) => { - expect(err).to.not.exist() - expect(result).to.exist() - expect(result.length).to.eql(0) - done() - }) - }) - - it('creates a cid with the currect multicodec', (done) => { - const buffer = Buffer.from('deadbeef', 'hex') - // const cid = new CID('zDvjKAA4iXx') - // const ipfsBlock = new IpfsBlock(buffer, cid) - ipldBin.util.cid(buffer, (err, cid) => { - expect(err).to.not.exist() - expect(cid).to.exist() - expect(cid.codec).to.eql('base2') - done() - }) - }) - - it('serializes to the same value', (done) => { - const buffer = Buffer.from('deadbeef', 'hex') - // const cid = new CID('zDvjKAA4iXx') - // const ipfsBlock = new IpfsBlock(buffer, cid) - ipldBin.util.serialize(buffer, (err, result) => { - expect(err).to.not.exist() - expect(result).to.exist() - expect(result.toString('hex')).to.eql(buffer.toString('hex')) - done() - }) - }) - - it('deserializes to the same value', (done) => { - const buffer = Buffer.from('deadbeef', 'hex') - // const cid = new CID('zDvjKAA4iXx') - // const ipfsBlock = new IpfsBlock(buffer, cid) - ipldBin.util.deserialize(buffer, (err, result) => { - expect(err).to.not.exist() - expect(result).to.exist() - expect(result.toString('hex')).to.eql(buffer.toString('hex')) - done() - }) - }) - }) -} diff --git a/test/node.js b/test/node.js index 9b9c09e..9e4ed15 100644 --- a/test/node.js +++ b/test/node.js @@ -26,7 +26,6 @@ describe('Node.js', () => { ], done) }) - require('./ipld-bin') require('./basics')(repo) require('./ipld-dag-pb')(repo) require('./ipld-dag-cbor')(repo) From aae53c3236fc5c571af76c94926bf4ca67494276 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 4 Oct 2017 15:01:16 -0700 Subject: [PATCH 5/9] remove obsolete test --- test/browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/browser.js b/test/browser.js index 340210e..ac3c679 100644 --- a/test/browser.js +++ b/test/browser.js @@ -37,7 +37,6 @@ describe('Browser', () => { ], done) }) - require('./ipld-bin') require('./basics')(repo) require('./ipld-dag-pb')(repo) require('./ipld-dag-cbor')(repo) From a38ce5160b2c837d4f19e1f068641a550dbf8a58 Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 6 Oct 2017 14:52:57 +0300 Subject: [PATCH 6/9] chore: update deps --- .gitignore | 1 + package.json | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index e4c5b0e..1c73b37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +docs **/node_modules/ **/*.log test/repo-tests* diff --git a/package.json b/package.json index cccf516..0fa0f23 100644 --- a/package.json +++ b/package.json @@ -8,16 +8,16 @@ "test" ], "scripts": { - "lint": "aegir-lint", - "build": "aegir-build", - "test": "aegir-test", - "test:node": "aegir-test node", - "test:browser": "aegir-test browser", - "release": "aegir-release", - "release-minor": "aegir-release --type minor", - "release-major": "aegir-release --type major", - "coverage": "aegir-coverage", - "coverage-publish": "aegir-coverage publish" + "lint": "aegir lint", + "build": "aegir build", + "test": "aegir test", + "test:node": "aegir test --target node", + "test:browser": "aegir test --target browser", + "release": "aegir release", + "release-minor": "aegir release --type minor", + "release-major": "aegir release --type major", + "coverage": "aegir coverage", + "coverage-publish": "aegir coverage --provider coveralls" }, "keywords": [ "IPFS" @@ -32,7 +32,7 @@ "homepage": "https://github.com/ipld/js-ipld-resolver#readme", "license": "MIT", "devDependencies": { - "aegir": "^11.0.2", + "aegir": "^12.0.8", "chai": "^4.1.2", "dirty-chai": "^2.0.1", "eth-hash-to-cid": "^0.1.0", @@ -40,13 +40,13 @@ "lodash": "^4.17.4", "ncp": "^2.0.0", "pre-commit": "^1.2.2", - "rimraf": "^2.6.1", + "rimraf": "^2.6.2", "rlp": "^2.0.0" }, "dependencies": { "async": "^2.5.0", - "cids": "~0.5.1", - "interface-datastore": "^0.3.0", + "cids": "~0.5.2", + "interface-datastore": "^0.3.1", "ipfs-block": "~0.6.0", "ipfs-block-service": "~0.12.0", "ipfs-repo": "~0.17.0", @@ -54,14 +54,14 @@ "ipld-dag-pb": "~0.11.2", "ipld-eth-star": "^1.4.1", "ipld-git": "^0.1.0", - "ipld-raw": "^1.0.1", - "is-ipfs": "~0.3.0", + "ipld-raw": "^1.0.5", + "is-ipfs": "~0.3.2", "lodash.flatten": "^4.4.0", "lodash.includes": "^4.3.0", - "memdown": "^1.2.7", + "memdown": "^1.4.1", "multihashes": "~0.4.9", "pull-sort": "^1.0.1", - "pull-stream": "^3.6.0", + "pull-stream": "^3.6.1", "pull-traverse": "^1.0.3" }, "contributors": [ From d65bbcd80c86912f5511d8d0529d6d444574cbca Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 6 Oct 2017 15:00:23 +0300 Subject: [PATCH 7/9] chore: lint --- src/index.js | 44 ++++++++++++++++++++++---------------------- test/basics.js | 8 ++++---- test/ipld-all.js | 4 ++-- test/ipld-dag-pb.js | 12 ++++++------ test/ipld-git.js | 2 +- test/node.js | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/index.js b/src/index.js index e02e238..71b2bb3 100644 --- a/src/index.js +++ b/src/index.js @@ -59,48 +59,48 @@ class IPLDResolver { // Support by default dag-pb, dag-cbor, git, and eth-* this.support.add(dagPB.resolver.multicodec, - dagPB.resolver, - dagPB.util) + dagPB.resolver, + dagPB.util) this.support.add(dagCBOR.resolver.multicodec, - dagCBOR.resolver, - dagCBOR.util) + dagCBOR.resolver, + dagCBOR.util) this.support.add(ipldGit.resolver.multicodec, - ipldGit.resolver, - ipldGit.util) + ipldGit.resolver, + ipldGit.util) this.support.add(ipldEthAccountSnapshot.resolver.multicodec, - ipldEthAccountSnapshot.resolver, - ipldEthAccountSnapshot.util) + ipldEthAccountSnapshot.resolver, + ipldEthAccountSnapshot.util) this.support.add(ipldEthBlock.resolver.multicodec, - ipldEthBlock.resolver, - ipldEthBlock.util) + ipldEthBlock.resolver, + ipldEthBlock.util) this.support.add(ipldEthBlockList.resolver.multicodec, - ipldEthBlockList.resolver, - ipldEthBlockList.util) + ipldEthBlockList.resolver, + ipldEthBlockList.util) this.support.add(ipldEthStateTrie.resolver.multicodec, - ipldEthStateTrie.resolver, - ipldEthStateTrie.util) + ipldEthStateTrie.resolver, + ipldEthStateTrie.util) this.support.add(ipldEthStorageTrie.resolver.multicodec, - ipldEthStorageTrie.resolver, - ipldEthStorageTrie.util) + ipldEthStorageTrie.resolver, + ipldEthStorageTrie.util) this.support.add(ipldEthTx.resolver.multicodec, - ipldEthTx.resolver, - ipldEthTx.util) + ipldEthTx.resolver, + ipldEthTx.util) this.support.add(ipldEthTxTrie.resolver.multicodec, - ipldEthTxTrie.resolver, - ipldEthTxTrie.util) + ipldEthTxTrie.resolver, + ipldEthTxTrie.util) this.support.add(ipldRaw.resolver.multicodec, - ipldRaw.resolver, - ipldRaw.util) + ipldRaw.resolver, + ipldRaw.util) } get (cid, path, options, callback) { diff --git a/test/basics.js b/test/basics.js index 67530a5..0e96f7e 100644 --- a/test/basics.js +++ b/test/basics.js @@ -36,7 +36,7 @@ module.exports = (repo) => { const bs = new BlockService(repo) const r = new IPLDResolver(bs) // choosing a format that is not supported - const cid = new CID(1, 'base1', multihash.encode(new Buffer('abcd', 'hex'), 'sha1')) + const cid = new CID(1, 'base1', multihash.encode(Buffer.from('abcd', 'hex'), 'sha1')) r.get(cid, '/', {}, (err, result) => { expect(err).to.exist() expect(err.message).to.eql('No resolver found for codec "base1"') @@ -48,7 +48,7 @@ module.exports = (repo) => { const bs = new BlockService(repo) const r = new IPLDResolver(bs) // choosing a format that is not supported - const cid = new CID(1, 'base1', multihash.encode(new Buffer('abcd', 'hex'), 'sha1')) + const cid = new CID(1, 'base1', multihash.encode(Buffer.from('abcd', 'hex'), 'sha1')) r.get(cid, (err, result) => { expect(err).to.exist() expect(err.message).to.eql('No resolver found for codec "base1"') @@ -71,7 +71,7 @@ module.exports = (repo) => { const bs = new BlockService(repo) const r = new IPLDResolver(bs) // choosing a format that is not supported - const cid = new CID(1, 'base1', multihash.encode(new Buffer('abcd', 'hex'), 'sha1')) + const cid = new CID(1, 'base1', multihash.encode(Buffer.from('abcd', 'hex'), 'sha1')) r._put(cid, null, (err, result) => { expect(err).to.exist() expect(err.message).to.eql('No resolver found for codec "base1"') @@ -83,7 +83,7 @@ module.exports = (repo) => { const bs = new BlockService(repo) const r = new IPLDResolver(bs) // choosing a format that is not supported - const cid = new CID(1, 'base1', multihash.encode(new Buffer('abcd', 'hex'), 'sha1')) + const cid = new CID(1, 'base1', multihash.encode(Buffer.from('abcd', 'hex'), 'sha1')) pull( r.treeStream(cid, '/', {}), pull.collect(function (err) { diff --git a/test/ipld-all.js b/test/ipld-all.js index 6758fab..aa5baaf 100644 --- a/test/ipld-all.js +++ b/test/ipld-all.js @@ -31,7 +31,7 @@ describe('IPLD Resolver for dag-cbor + dag-pb', () => { (cb) => IPLDResolver.inMemory(cb), (res, cb) => { resolver = res - dagPB.DAGNode.create(new Buffer('I am inside a Protobuf'), cb) + dagPB.DAGNode.create(Buffer.from('I am inside a Protobuf'), cb) }, (node, cb) => { nodePb = node @@ -62,7 +62,7 @@ describe('IPLD Resolver for dag-cbor + dag-pb', () => { it('resolve through different formats', (done) => { resolver.get(cidCbor, 'pb/Data', (err, result) => { expect(err).to.not.exist() - expect(result.value).to.eql(new Buffer('I am inside a Protobuf')) + expect(result.value).to.eql(Buffer.from('I am inside a Protobuf')) done() }) }) diff --git a/test/ipld-dag-pb.js b/test/ipld-dag-pb.js index d7b66bd..763ead1 100644 --- a/test/ipld-dag-pb.js +++ b/test/ipld-dag-pb.js @@ -30,21 +30,21 @@ module.exports = (repo) => { series([ (cb) => { - dagPB.DAGNode.create(new Buffer('I am 1'), (err, node) => { + dagPB.DAGNode.create(Buffer.from('I am 1'), (err, node) => { expect(err).to.not.exist() node1 = node cb() }) }, (cb) => { - dagPB.DAGNode.create(new Buffer('I am 2'), (err, node) => { + dagPB.DAGNode.create(Buffer.from('I am 2'), (err, node) => { expect(err).to.not.exist() node2 = node cb() }) }, (cb) => { - dagPB.DAGNode.create(new Buffer('I am 3'), (err, node) => { + dagPB.DAGNode.create(Buffer.from('I am 3'), (err, node) => { expect(err).to.not.exist() node3 = node cb() @@ -190,7 +190,7 @@ module.exports = (repo) => { it('resolver.get value within 1st node scope', (done) => { resolver.get(cid1, 'Data', (err, result) => { expect(err).to.not.exist() - expect(result.value).to.eql(new Buffer('I am 1')) + expect(result.value).to.eql(Buffer.from('I am 1')) done() }) }) @@ -198,7 +198,7 @@ module.exports = (repo) => { it('resolver.get value within nested scope (1 level)', (done) => { resolver.get(cid2, 'Links/0/Hash/Data', (err, result) => { expect(err).to.not.exist() - expect(result.value).to.eql(new Buffer('I am 1')) + expect(result.value).to.eql(Buffer.from('I am 1')) done() }) }) @@ -206,7 +206,7 @@ module.exports = (repo) => { it('resolver.get value within nested scope (2 levels)', (done) => { resolver.get(cid3, 'Links/1/Hash/Links/0/Hash/Data', (err, result) => { expect(err).to.not.exist() - expect(result.value).to.eql(new Buffer('I am 1')) + expect(result.value).to.eql(Buffer.from('I am 1')) done() }) }) diff --git a/test/ipld-git.js b/test/ipld-git.js index f70bf12..47df288 100644 --- a/test/ipld-git.js +++ b/test/ipld-git.js @@ -36,7 +36,7 @@ module.exports = (repo) => { series([ (cb) => { - blobNode = new Buffer('626c6f62203800736f6d6564617461', 'hex') // blob 8\0somedata + blobNode = Buffer.from('626c6f62203800736f6d6564617461', 'hex') // blob 8\0somedata ipldGit.util.cid(blobNode, (err, cid) => { expect(err).to.not.exist() diff --git a/test/node.js b/test/node.js index 9e4ed15..702be4a 100644 --- a/test/node.js +++ b/test/node.js @@ -9,7 +9,7 @@ const os = require('os') describe('Node.js', () => { const repoExample = process.cwd() + '/test/example-repo' - const repoTests = os.tmpDir() + '/t-r-' + Date.now() + const repoTests = os.tmpdir() + '/t-r-' + Date.now() const repo = new IPFSRepo(repoTests) before((done) => { From 88056501938ff1cf007cb1c284247cdf9b1f30c4 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 6 Oct 2017 13:06:30 -0700 Subject: [PATCH 8/9] deps - use resolver with codec specified as 'raw' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6325883..caa6824 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "ipld-dag-pb": "~0.11.2", "ipld-ethereum": "^1.4.2", "ipld-git": "^0.1.0", - "ipld-raw": "^1.0.5", + "ipld-raw": "^1.0.6", "is-ipfs": "~0.3.2", "lodash.flatten": "^4.4.0", "lodash.includes": "^4.3.0", From 5159ca30c90271e73e7de9ff85d6100eac1c01bc Mon Sep 17 00:00:00 2001 From: David Dias Date: Sat, 7 Oct 2017 19:38:44 +0300 Subject: [PATCH 9/9] chore: update circle CI config --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index 56f7efb..a0da9bc 100644 --- a/circle.yml +++ b/circle.yml @@ -6,8 +6,12 @@ dependencies: pre: - google-chrome --version - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + - 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 - sudo dpkg -i google-chrome.deb || true + - sudo dpkg -i libnss3*.deb || true - sudo apt-get update + - sudo apt-get install -f || true + - sudo dpkg -i libnss3*.deb - sudo apt-get install -f - sudo apt-get install --only-upgrade lsb-base - sudo dpkg -i google-chrome.deb