From f81dce5bf54df3a3578e4786bfb741d761cd1297 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 22 Feb 2018 10:47:19 +0000 Subject: [PATCH 1/7] fix: remove argument from .stats.bw* (#699) * Update bw-readable-stream.js * Update bw-pull-stream.js --- src/stats/bw-pull-stream.js | 2 +- src/stats/bw-readable-stream.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stats/bw-pull-stream.js b/src/stats/bw-pull-stream.js index 51f5a86d9..f302a3a5f 100644 --- a/src/stats/bw-pull-stream.js +++ b/src/stats/bw-pull-stream.js @@ -6,7 +6,7 @@ const transformChunk = require('./bw-util') const deferred = require('pull-defer') module.exports = (send) => { - return (hash, opts) => { + return (opts) => { opts = opts || {} const p = deferred.source() diff --git a/src/stats/bw-readable-stream.js b/src/stats/bw-readable-stream.js index aa9f0701a..c36fea518 100644 --- a/src/stats/bw-readable-stream.js +++ b/src/stats/bw-readable-stream.js @@ -5,7 +5,7 @@ const pump = require('pump') const transformChunk = require('./bw-util') module.exports = (send) => { - return (hash, opts) => { + return (opts) => { opts = opts || {} const pt = new Stream.Transform({ From 78ba320573ab73ff4224740f59e82e2e504d7881 Mon Sep 17 00:00:00 2001 From: victorbjelkholm Date: Tue, 27 Feb 2018 12:59:20 +0100 Subject: [PATCH 2/7] Fix anode -> node type --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a2d7c89e..5fd0ed098 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "release-minor": "node --max-old-space-size=8192 $(npm bin)/aegir release --type minor ", "release-major": "node --max-old-space-size=8192 $(npm bin)/aegir release --type major ", "coverage": "node --max-old-space-size=8192 $(npm bin)/aegir coverage --timeout 100000", - "coverage-publish": "anode --max-old-space-size=8192 $(npm bin)/aegir coverage --provider coveralls --timeout 100000" + "coverage-publish": "node --max-old-space-size=8192 $(npm bin)/aegir coverage --provider coveralls --timeout 100000" }, "dependencies": { "async": "^2.6.0", From cee9a3dd11f22199f4948f3e76dfbd4ccc479224 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Tue, 6 Mar 2018 05:14:57 -0600 Subject: [PATCH 3/7] test: use reduced keysize for faster tests (#698) --- package.json | 22 ++++++++++++---------- test/bitswap.spec.js | 2 +- test/commands.spec.js | 2 +- test/constructor.spec.js | 2 +- test/diag.spec.js | 2 +- test/files.spec.js | 2 +- test/get.spec.js | 2 +- test/interface/block.spec.js | 2 +- test/interface/bootstrap.spec.js | 2 +- test/interface/config.spec.js | 2 +- test/interface/dht.spec.js | 2 +- test/interface/files-mfs.spec.js | 2 +- test/interface/files.spec.js | 2 +- test/interface/key.spec.js | 2 +- test/interface/miscellaneous.spec.js | 2 +- test/interface/object.spec.js | 2 +- test/interface/pin.spec.js | 2 +- test/interface/pubsub.spec.js | 2 +- test/interface/repo.spec.js | 2 +- test/interface/stats.spec.js | 2 +- test/interface/swarm.spec.js | 2 +- test/key.spec.js | 2 +- test/log.spec.js | 2 +- test/name.spec.js | 4 ++-- test/ping.spec.js | 4 ++-- test/pubsub-in-browser.spec.js | 2 +- test/refs.spec.js | 2 +- test/repo.spec.js | 2 +- test/stats.spec.js | 2 +- test/util.spec.js | 2 +- 30 files changed, 43 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 5fd0ed098..0b435c537 100644 --- a/package.json +++ b/package.json @@ -12,17 +12,17 @@ "ipfs": false }, "scripts": { - "test": "aegir test", + "test": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir test", "test:node": "aegir test -t node", - "test:browser": "node --max-old-space-size=8192 $(npm bin)/aegir test -t browser", - "test:webworker": "node --max-old-space-size=8192 $(npm bin)/aegir test -t webworker", + "test:browser": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir test -t browser", + "test:webworker": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir test -t webworker", "lint": "aegir lint", "build": "aegir build", - "release": "node --max-old-space-size=8192 $(npm bin)/aegir release ", - "release-minor": "node --max-old-space-size=8192 $(npm bin)/aegir release --type minor ", - "release-major": "node --max-old-space-size=8192 $(npm bin)/aegir release --type major ", - "coverage": "node --max-old-space-size=8192 $(npm bin)/aegir coverage --timeout 100000", - "coverage-publish": "node --max-old-space-size=8192 $(npm bin)/aegir coverage --provider coveralls --timeout 100000" + "release": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir release ", + "release-minor": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir release --type minor ", + "release-major": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir release --type major ", + "coverage": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir coverage --timeout 100000", + "coverage-publish": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir coverage --provider coveralls --timeout 100000" }, "dependencies": { "async": "^2.6.0", @@ -67,13 +67,15 @@ "devDependencies": { "aegir": "^13.0.0", "chai": "^4.1.2", + "cross-env": "^5.1.3", "dirty-chai": "^2.0.1", "eslint-plugin-react": "^7.6.1", "go-ipfs-dep": "^0.4.13", "gulp": "^3.9.1", - "interface-ipfs-core": "~0.51.0", "hapi": "^17.2.0", - "ipfsd-ctl": "~0.28.0", + "interface-ipfs-core": "~0.51.0", + "ipfs": "~0.28.0", + "ipfsd-ctl": "~0.29.0", "pre-commit": "^1.2.2", "socket.io": "^2.0.4", "socket.io-client": "^2.0.4", diff --git a/test/bitswap.spec.js b/test/bitswap.spec.js index 8bd16f2c0..2a69a1b06 100644 --- a/test/bitswap.spec.js +++ b/test/bitswap.spec.js @@ -19,7 +19,7 @@ describe('.bitswap', function () { before(function (done) { this.timeout(20 * 1000) // slow CI - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/commands.spec.js b/test/commands.spec.js index cb69c0b8b..d8859c5b4 100644 --- a/test/commands.spec.js +++ b/test/commands.spec.js @@ -17,7 +17,7 @@ describe('.commands', function () { let ipfs before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/constructor.spec.js b/test/constructor.spec.js index 74042c176..82da19608 100644 --- a/test/constructor.spec.js +++ b/test/constructor.spec.js @@ -27,7 +27,7 @@ describe('ipfs-api constructor tests', () => { before(function (done) { this.timeout(20 * 1000) // slow CI - f.spawn((err, node) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, node) => { expect(err).to.not.exist() ipfsd = node apiAddr = node.apiAddr.toString() diff --git a/test/diag.spec.js b/test/diag.spec.js index ef2f7c605..216f0ac9a 100644 --- a/test/diag.spec.js +++ b/test/diag.spec.js @@ -20,7 +20,7 @@ describe('.diag', function () { let ipfs before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/files.spec.js b/test/files.spec.js index cf5eaaff1..41c5bc1a8 100644 --- a/test/files.spec.js +++ b/test/files.spec.js @@ -37,7 +37,7 @@ describe('.files (the MFS API part)', function () { const expectedMultihash = 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP' before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/get.spec.js b/test/get.spec.js index e93df5182..4e5f6f743 100644 --- a/test/get.spec.js +++ b/test/get.spec.js @@ -31,7 +31,7 @@ describe('.get (specific go-ipfs features)', function () { before((done) => { series([ - (cb) => f.spawn((err, _ipfsd) => { + (cb) => f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/interface/block.spec.js b/test/interface/block.spec.js index b7b4181cf..180f17a04 100644 --- a/test/interface/block.spec.js +++ b/test/interface/block.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/bootstrap.spec.js b/test/interface/bootstrap.spec.js index 4e2e4bd00..caea5856e 100644 --- a/test/interface/bootstrap.spec.js +++ b/test/interface/bootstrap.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/config.spec.js b/test/interface/config.spec.js index 0c47b099b..aeb4a6a9a 100644 --- a/test/interface/config.spec.js +++ b/test/interface/config.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/dht.spec.js b/test/interface/dht.spec.js index 4e02d8343..2b324cb99 100644 --- a/test/interface/dht.spec.js +++ b/test/interface/dht.spec.js @@ -12,7 +12,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/files-mfs.spec.js b/test/interface/files-mfs.spec.js index 9923adc11..6de81af4e 100644 --- a/test/interface/files-mfs.spec.js +++ b/test/interface/files-mfs.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/files.spec.js b/test/interface/files.spec.js index 2b464be20..c99f768a6 100644 --- a/test/interface/files.spec.js +++ b/test/interface/files.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/key.spec.js b/test/interface/key.spec.js index b34221f70..56f6e6893 100644 --- a/test/interface/key.spec.js +++ b/test/interface/key.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/miscellaneous.spec.js b/test/interface/miscellaneous.spec.js index 1d203604e..c890a2fa3 100644 --- a/test/interface/miscellaneous.spec.js +++ b/test/interface/miscellaneous.spec.js @@ -12,7 +12,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/object.spec.js b/test/interface/object.spec.js index bdc74e227..e76c45673 100644 --- a/test/interface/object.spec.js +++ b/test/interface/object.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/pin.spec.js b/test/interface/pin.spec.js index dd7891461..e56bc413d 100644 --- a/test/interface/pin.spec.js +++ b/test/interface/pin.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/pubsub.spec.js b/test/interface/pubsub.spec.js index ddba34e2a..154fec2f4 100644 --- a/test/interface/pubsub.spec.js +++ b/test/interface/pubsub.spec.js @@ -16,7 +16,7 @@ if (isNode) { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn({ args: ['--enable-pubsub-experiment'] }, + f.spawn({ initOptions: { bits: 1024 }, args: ['--enable-pubsub-experiment'] }, (err, _ipfsd) => { if (err) { return cb(err) diff --git a/test/interface/repo.spec.js b/test/interface/repo.spec.js index 211f8bb41..c6966772d 100644 --- a/test/interface/repo.spec.js +++ b/test/interface/repo.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/stats.spec.js b/test/interface/stats.spec.js index 1a2a9aa15..eee30ad98 100644 --- a/test/interface/stats.spec.js +++ b/test/interface/stats.spec.js @@ -13,7 +13,7 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/interface/swarm.spec.js b/test/interface/swarm.spec.js index 735f60d95..56b9cbe41 100644 --- a/test/interface/swarm.spec.js +++ b/test/interface/swarm.spec.js @@ -23,7 +23,7 @@ const common = { config = undefined } - f.spawn({ repoPath, config }, (err, _ipfsd) => { + f.spawn({ repoPath, config, initOptions: { bits: 1024 } }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/key.spec.js b/test/key.spec.js index 5d958708f..24a2a77b1 100644 --- a/test/key.spec.js +++ b/test/key.spec.js @@ -17,7 +17,7 @@ describe('.key', function () { let ipfs before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/log.spec.js b/test/log.spec.js index 4c780e37d..b45911c2f 100644 --- a/test/log.spec.js +++ b/test/log.spec.js @@ -17,7 +17,7 @@ describe('.log', function () { let ipfs before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/name.spec.js b/test/name.spec.js index cb6c691f8..ca486f11b 100644 --- a/test/name.spec.js +++ b/test/name.spec.js @@ -27,7 +27,7 @@ describe('.name', () => { series([ (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) @@ -35,7 +35,7 @@ describe('.name', () => { }) }, (cb) => { - f.spawn((err, node) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, node) => { expect(err).to.not.exist() other = node.api otherd = node diff --git a/test/ping.spec.js b/test/ping.spec.js index c39673615..747464798 100644 --- a/test/ping.spec.js +++ b/test/ping.spec.js @@ -23,7 +23,7 @@ describe.skip('.ping', () => { series([ (cb) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) @@ -32,7 +32,7 @@ describe.skip('.ping', () => { }, (cb) => { console.log('going to spawn second node') - f.spawn((err, node) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, node) => { expect(err).to.not.exist() other = node.api otherd = node diff --git a/test/pubsub-in-browser.spec.js b/test/pubsub-in-browser.spec.js index 95070e459..ce2f1139e 100644 --- a/test/pubsub-in-browser.spec.js +++ b/test/pubsub-in-browser.spec.js @@ -47,7 +47,7 @@ describe('.pubsub is not supported in the browser, yet!', function () { let ipfsd before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/refs.spec.js b/test/refs.spec.js index d74717597..e8d36b541 100644 --- a/test/refs.spec.js +++ b/test/refs.spec.js @@ -35,7 +35,7 @@ describe('.refs', function () { } waterfall([ - (cb) => f.spawn(cb), + (cb) => f.spawn({ initOptions: { bits: 1024 } }, cb), (_ipfsd, cb) => { ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/repo.spec.js b/test/repo.spec.js index ee3f7f0b6..f08c50ca1 100644 --- a/test/repo.spec.js +++ b/test/repo.spec.js @@ -16,7 +16,7 @@ describe('.repo', function () { let ipfsd before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/stats.spec.js b/test/stats.spec.js index 73cd29774..81abb945a 100644 --- a/test/stats.spec.js +++ b/test/stats.spec.js @@ -16,7 +16,7 @@ describe('stats', function () { let ipfsd before((done) => { - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) diff --git a/test/util.spec.js b/test/util.spec.js index 1573620fd..8f5362b09 100644 --- a/test/util.spec.js +++ b/test/util.spec.js @@ -22,7 +22,7 @@ describe('.util', () => { before(function (done) { this.timeout(20 * 1000) // slow CI - f.spawn((err, _ipfsd) => { + f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => { expect(err).to.not.exist() ipfsd = _ipfsd ipfs = IPFSApi(_ipfsd.apiAddr) From 1f4eec4b067b624b3584d81202a0d14360ff990e Mon Sep 17 00:00:00 2001 From: Volker Mische Date: Wed, 7 Mar 2018 14:33:40 +0100 Subject: [PATCH 4/7] test: make fixtures cross-platform compatible Git on Windows changes the end of lines from LF to CRLF by default. This changes the bytes of fixtures that a are text files. Change the Git repository setting to checkout all files in `test/fixtures` as they are, without platform specific modifications. --- test/fixtures/.gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/fixtures/.gitattributes diff --git a/test/fixtures/.gitattributes b/test/fixtures/.gitattributes new file mode 100644 index 000000000..fa1385d99 --- /dev/null +++ b/test/fixtures/.gitattributes @@ -0,0 +1 @@ +* -text From 85cc2a88e7952315d7f1cbcc301c45ebacea4f9d Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 9 Mar 2018 10:21:31 +0000 Subject: [PATCH 5/7] fix: regression on files.add and update deps (#709) --- package.json | 20 ++++++++++---------- src/files/add.js | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 0b435c537..4ab3e3bcd 100644 --- a/package.json +++ b/package.json @@ -29,16 +29,16 @@ "big.js": "^5.0.3", "bs58": "^4.0.1", "cids": "~0.5.2", - "concat-stream": "^1.6.0", + "concat-stream": "^1.6.1", "detect-node": "^2.0.3", "flatmap": "0.0.3", "glob": "^7.1.2", "ipfs-block": "~0.6.1", "ipfs-unixfs": "~0.1.14", - "ipld-dag-pb": "~0.13.0", + "ipld-dag-pb": "~0.13.1", "is-ipfs": "^0.3.2", "is-stream": "^1.1.0", - "lru-cache": "^4.1.1", + "lru-cache": "^4.1.2", "multiaddr": "^3.0.2", "multihashes": "~0.4.13", "ndjson": "^1.5.0", @@ -47,10 +47,10 @@ "peer-info": "~0.11.6", "promisify-es6": "^1.0.3", "pull-defer": "^0.2.2", - "pull-pushable": "^2.1.2", + "pull-pushable": "^2.2.0", "pump": "^3.0.0", "qs": "^6.5.1", - "readable-stream": "^2.3.4", + "readable-stream": "^2.3.5", "stream-http": "^2.8.0", "stream-to-pull-stream": "^1.7.2", "streamifier": "^0.1.1", @@ -65,17 +65,17 @@ "url": "https://github.com/ipfs/js-ipfs-api" }, "devDependencies": { - "aegir": "^13.0.0", + "aegir": "^13.0.6", "chai": "^4.1.2", "cross-env": "^5.1.3", "dirty-chai": "^2.0.1", - "eslint-plugin-react": "^7.6.1", + "eslint-plugin-react": "^7.7.0", "go-ipfs-dep": "^0.4.13", "gulp": "^3.9.1", - "hapi": "^17.2.0", - "interface-ipfs-core": "~0.51.0", + "hapi": "^17.2.2", + "interface-ipfs-core": "~0.55.1", "ipfs": "~0.28.0", - "ipfsd-ctl": "~0.29.0", + "ipfsd-ctl": "~0.29.1", "pre-commit": "^1.2.2", "socket.io": "^2.0.4", "socket.io-client": "^2.0.4", diff --git a/src/files/add.js b/src/files/add.js index f7bb2b690..2d35b414d 100644 --- a/src/files/add.js +++ b/src/files/add.js @@ -25,10 +25,11 @@ module.exports = (send) => { const ok = Buffer.isBuffer(_files) || isStream.readable(_files) || Array.isArray(_files) || - OtherBuffer.isBuffer(_files) + OtherBuffer.isBuffer(_files) || + typeof _files === 'object' if (!ok) { - return callback(new Error('"files" must be a buffer, readable stream, or array of objects')) + return callback(new Error('first arg must be a buffer, readable stream, an object or array of objects')) } const files = [].concat(_files) From 3d27999da736f8b867895363d5c6f92bc2ab123a Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 9 Mar 2018 10:29:10 +0000 Subject: [PATCH 6/7] chore: update contributors --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4ab3e3bcd..8f686e467 100644 --- a/package.json +++ b/package.json @@ -133,6 +133,7 @@ "Tara Vancil ", "Travis Person ", "Victor Bjelkholm ", + "Volker Mische ", "dmitriy ryajov ", "elsehow ", "ethers ", @@ -142,8 +143,8 @@ "noah the goodra ", "priecint ", "samuli ", - "Łukasz Magiera ", - "ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ " + "victorbjelkholm ", + "Łukasz Magiera " ], "license": "MIT", "bugs": { From 1a0d6a9585fac6cef519003b72b9862ff53c9511 Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 9 Mar 2018 10:38:56 +0000 Subject: [PATCH 7/7] chore: release version v18.1.2 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21d3940a2..d4765e51f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ + +## [18.1.2](https://github.com/ipfs/js-ipfs-api/compare/v18.1.1...v18.1.2) (2018-03-09) + + +### Bug Fixes + +* regression on files.add and update deps ([#709](https://github.com/ipfs/js-ipfs-api/issues/709)) ([85cc2a8](https://github.com/ipfs/js-ipfs-api/commit/85cc2a8)) +* remove argument from .stats.bw* ([#699](https://github.com/ipfs/js-ipfs-api/issues/699)) ([f81dce5](https://github.com/ipfs/js-ipfs-api/commit/f81dce5)) + + + ## [18.1.1](https://github.com/ipfs/js-ipfs-api/compare/v18.0.0...v18.1.1) (2018-02-20) diff --git a/package.json b/package.json index 8f686e467..c30438681 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipfs-api", - "version": "18.1.1", + "version": "18.1.2", "description": "A client library for the IPFS HTTP API", "main": "src/index.js", "browser": {