From 7f69628cd86cdc3efe092a697021013518c5a5f3 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Thu, 22 Feb 2018 02:59:52 -0600 Subject: [PATCH] feat: use reduces keysize (#1232) * feat: use reduces keysize * chore: update deps --- package.json | 24 ++++++++++++------------ test/cli/ls.js | 2 +- test/cli/pubsub.js | 2 ++ test/cli/swarm.js | 12 ++++++++++-- test/core/bitswap.spec.js | 7 ++++++- test/core/bootstrap.spec.js | 1 + test/core/files-sharding.spec.js | 2 ++ test/core/interface/block.js | 4 +++- test/core/interface/bootstrap.js | 4 +++- test/core/interface/config.js | 4 +++- test/core/interface/dag.js | 4 +++- test/core/interface/files.js | 4 +++- test/core/interface/generic.js | 4 +++- test/core/interface/key.js | 3 ++- test/core/interface/object.js | 4 +++- test/core/interface/pubsub.js | 18 ++++++++++-------- test/core/interface/stats.js | 4 +++- test/core/interface/swarm.js | 6 +++++- test/core/kad-dht.node.js | 6 +++++- test/http-api/interface/block.js | 4 +++- test/http-api/interface/bootstrap.js | 4 +++- test/http-api/interface/config.js | 4 +++- test/http-api/interface/files.js | 4 +++- test/http-api/interface/key.js | 3 ++- test/http-api/interface/object.js | 4 +++- test/http-api/interface/pubsub.js | 18 ++++++++++-------- test/http-api/interface/swarm.js | 6 +++++- test/utils/on-and-off.js | 6 +++++- 28 files changed, 117 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index ad1c74bbfc..850bbf85bf 100644 --- a/package.json +++ b/package.json @@ -60,21 +60,21 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^13.0.0", + "aegir": "^13.0.5", "buffer-loader": "0.0.1", "chai": "^4.1.2", "delay": "^2.0.0", "detect-node": "^2.0.3", "dir-compare": "^1.4.0", "dirty-chai": "^2.0.1", - "eslint-plugin-react": "^7.6.1", + "eslint-plugin-react": "^7.7.0", "execa": "^0.9.0", "expose-loader": "^0.7.4", "form-data": "^2.3.2", "go-ipfs-dep": "^0.4.13", "hat": "0.0.3", "interface-ipfs-core": "~0.52.0", - "ipfsd-ctl": "~0.28.0", + "ipfsd-ctl": "~0.29.0", "left-pad": "^1.2.0", "lodash": "^4.17.5", "mocha": "^5.0.1", @@ -98,7 +98,7 @@ "byteman": "^1.3.5", "cids": "~0.5.2", "debug": "^3.1.0", - "file-type": "^7.5.0", + "file-type": "^7.6.0", "filesize": "^3.6.0", "fsm-event": "^2.1.0", "get-folder-size": "^1.0.1", @@ -119,7 +119,7 @@ "is-ipfs": "^0.3.2", "is-stream": "^1.1.0", "joi": "^13.1.2", - "libp2p": "~0.17.0", + "libp2p": "~0.18.0", "libp2p-circuit": "~0.1.4", "libp2p-floodsub": "~0.14.1", "libp2p-kad-dht": "~0.8.0", @@ -128,16 +128,16 @@ "libp2p-multiplex": "~0.5.1", "libp2p-railing": "~0.7.1", "libp2p-secio": "~0.9.2", - "libp2p-tcp": "~0.11.5", - "libp2p-webrtc-star": "~0.13.3", - "libp2p-websocket-star": "~0.7.6", - "libp2p-websockets": "~0.10.4", + "libp2p-tcp": "~0.11.6", + "libp2p-webrtc-star": "~0.13.4", + "libp2p-websocket-star": "~0.7.7", + "libp2p-websockets": "~0.10.5", "lodash.flatmap": "^4.5.0", "lodash.get": "^4.4.2", "lodash.sortby": "^4.7.0", "lodash.values": "^4.3.0", "mafmt": "^4.0.0", - "mime-types": "^2.1.17", + "mime-types": "^2.1.18", "mkdirp": "~0.5.1", "multiaddr": "^3.0.2", "multihashes": "~0.4.13", @@ -153,9 +153,9 @@ "pull-file": "^1.1.0", "pull-ndjson": "^0.1.1", "pull-paramap": "^1.2.2", - "pull-pushable": "^2.1.2", + "pull-pushable": "^2.2.0", "pull-sort": "^1.0.1", - "pull-stream": "^3.6.1", + "pull-stream": "^3.6.2", "pull-stream-to-stream": "^1.3.4", "pull-zip": "^2.0.1", "read-pkg-up": "^3.0.0", diff --git a/test/cli/ls.js b/test/cli/ls.js index 80b75bf342..68acb5bcf3 100644 --- a/test/cli/ls.js +++ b/test/cli/ls.js @@ -31,7 +31,7 @@ describe('ls', () => runOnAndOff((thing) => { // If the daemon is on, ls should search until it hits a timeout return Promise.race([ ipfs.fail('ls QmYmW4HiZhotsoSqnv2o1oSssvkRM8b9RweBoH7ao5nki2'), - new Promise((res, rej) => setTimeout(res, 4000)) + new Promise((resolve, reject) => setTimeout(resolve, 4000)) ]) .catch(() => expect.fail(0, 1, 'Should have thrown or timedout')) }) diff --git a/test/cli/pubsub.js b/test/cli/pubsub.js index 8bf14731fa..4a87d0429c 100644 --- a/test/cli/pubsub.js +++ b/test/cli/pubsub.js @@ -44,6 +44,7 @@ describe('pubsub', function () { .create({ type: 'proc' }) .spawn({ exec: IPFS, + initOptions: { bits: 512 }, config, args: ['--enable-pubsub-experiment'] }, (err, _ipfsd) => { @@ -58,6 +59,7 @@ describe('pubsub', function () { before((done) => { df.spawn({ + initOptions: { bits: 512 }, args: ['--enable-pubsub-experiment'], exec: `./src/cli/bin.js`, config diff --git a/test/cli/swarm.js b/test/cli/swarm.js index 424734c194..889b309681 100644 --- a/test/cli/swarm.js +++ b/test/cli/swarm.js @@ -36,7 +36,11 @@ describe('swarm', () => { series([ (cb) => { - df.spawn({ exec: `./src/cli/bin.js`, config }, (err, node) => { + df.spawn({ + exec: `./src/cli/bin.js`, + config, + initOptions: { bits: 512 } + }, (err, node) => { expect(err).to.not.exist() ipfsA = ipfsExec(node.repoPath) nodes.push(node) @@ -44,7 +48,11 @@ describe('swarm', () => { }) }, (cb) => { - df.spawn({ exec: `./src/cli/bin.js`, config }, (err, node) => { + df.spawn({ + exec: `./src/cli/bin.js`, + config, + initOptions: { bits: 512 } + }, (err, node) => { expect(err).to.not.exist() node.api.id((err, id) => { expect(err).to.not.exist() diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js index b05244f249..edf703bc6f 100644 --- a/test/core/bitswap.spec.js +++ b/test/core/bitswap.spec.js @@ -70,6 +70,7 @@ let nodes = [] function addNode (inProcNode, callback) { fDaemon.spawn({ exec: './src/cli/bin.js', + initOptions: { bits: 512 }, config: { Addresses: { Swarm: [`/ip4/127.0.0.1/tcp/0/ws`] @@ -118,7 +119,11 @@ describe('bitswap', function () { }) } - fInProc.spawn({ exec: IPFS, config: config }, (err, _ipfsd) => { + fInProc.spawn({ + exec: IPFS, + config: config, + initOptions: { bits: 512 } + }, (err, _ipfsd) => { expect(err).to.not.exist() nodes.push(_ipfsd) inProcNode = _ipfsd.api diff --git a/test/core/bootstrap.spec.js b/test/core/bootstrap.spec.js index dd780ce8fd..f092765354 100644 --- a/test/core/bootstrap.spec.js +++ b/test/core/bootstrap.spec.js @@ -24,6 +24,7 @@ describe('bootstrap', () => { this.timeout(40 * 1000) df.spawn({ exec: IPFS, + initOptions: { bits: 512 }, config: { Addresses: { Swarm: ['/ip4/127.0.0.1/tcp/0'] diff --git a/test/core/files-sharding.spec.js b/test/core/files-sharding.spec.js index 156dbf4442..8c96f00aa4 100644 --- a/test/core/files-sharding.spec.js +++ b/test/core/files-sharding.spec.js @@ -36,6 +36,7 @@ describe('files directory (sharding tests)', () => { df.spawn({ exec: IPFS, + initOptions: { bits: 512 }, config: { Addresses: { Swarm: [] @@ -86,6 +87,7 @@ describe('files directory (sharding tests)', () => { df.spawn({ exec: IPFS, + initOptions: { bits: 512 }, args: ['--enable-sharding-experiment'], config: { Addresses: { diff --git a/test/core/interface/block.js b/test/core/interface/block.js index 5246ce3734..2e3da76f22 100644 --- a/test/core/interface/block.js +++ b/test/core/interface/block.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/bootstrap.js b/test/core/interface/bootstrap.js index 10c95208f4..20c0e69bb7 100644 --- a/test/core/interface/bootstrap.js +++ b/test/core/interface/bootstrap.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/config.js b/test/core/interface/config.js index 1408e2281f..31cb73262b 100644 --- a/test/core/interface/config.js +++ b/test/core/interface/config.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/dag.js b/test/core/interface/dag.js index 4e384cb105..cc1d0ebfd7 100644 --- a/test/core/interface/dag.js +++ b/test/core/interface/dag.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/files.js b/test/core/interface/files.js index 29fc97c530..5d13db6682 100644 --- a/test/core/interface/files.js +++ b/test/core/interface/files.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/generic.js b/test/core/interface/generic.js index 2393eed5f0..b7db2f3972 100644 --- a/test/core/interface/generic.js +++ b/test/core/interface/generic.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/key.js b/test/core/interface/key.js index 737d412743..384486a4a2 100644 --- a/test/core/interface/key.js +++ b/test/core/interface/key.js @@ -10,7 +10,8 @@ const IPFS = require('../../../src') const DaemonFactory = require('ipfsd-ctl') const df = DaemonFactory.create({ type: 'proc', exec: IPFS }) const options = { - args: ['--pass ipfs-is-awesome-software'] + args: ['--pass ipfs-is-awesome-software'], + initOptions: { bits: 512 } } const nodes = [] const common = { diff --git a/test/core/interface/object.js b/test/core/interface/object.js index 32ef8e0251..bc63af3bf8 100644 --- a/test/core/interface/object.js +++ b/test/core/interface/object.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/pubsub.js b/test/core/interface/pubsub.js index 2425f862d9..7dd5163995 100644 --- a/test/core/interface/pubsub.js +++ b/test/core/interface/pubsub.js @@ -14,15 +14,17 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn({ args: ['--enable-pubsub-experiment'] }, - (err, _ipfsd) => { - if (err) { - return cb(err) - } + df.spawn({ + initOptions: { bits: 512 }, + args: ['--enable-pubsub-experiment'] + }, (err, _ipfsd) => { + if (err) { + return cb(err) + } - nodes.push(_ipfsd) - cb(null, _ipfsd.api) - }) + nodes.push(_ipfsd) + cb(null, _ipfsd.api) + }) } }) }, diff --git a/test/core/interface/stats.js b/test/core/interface/stats.js index ea8c10a68b..3524c3b9c2 100644 --- a/test/core/interface/stats.js +++ b/test/core/interface/stats.js @@ -14,7 +14,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/interface/swarm.js b/test/core/interface/swarm.js index d5158701d8..933efb2f9c 100644 --- a/test/core/interface/swarm.js +++ b/test/core/interface/swarm.js @@ -24,7 +24,11 @@ const common = { config = undefined } - df.spawn({ repoPath, config }, (err, _ipfsd) => { + df.spawn({ + repoPath, + config, + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/core/kad-dht.node.js b/test/core/kad-dht.node.js index 09989579ca..1c9daea2a0 100644 --- a/test/core/kad-dht.node.js +++ b/test/core/kad-dht.node.js @@ -26,7 +26,11 @@ const config = { } function createNode (callback) { - f.spawn({ exec: './src/cli/bin.js', config }, callback) + f.spawn({ + exec: './src/cli/bin.js', + config, + initOptions: { bits: 512 } + }, callback) } describe.skip('verify that kad-dht is doing its thing', () => { diff --git a/test/http-api/interface/block.js b/test/http-api/interface/block.js index 9b5af8aa1a..a3a7717f03 100644 --- a/test/http-api/interface/block.js +++ b/test/http-api/interface/block.js @@ -12,7 +12,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/http-api/interface/bootstrap.js b/test/http-api/interface/bootstrap.js index 3f3df9b0d3..a41e18907e 100644 --- a/test/http-api/interface/bootstrap.js +++ b/test/http-api/interface/bootstrap.js @@ -12,7 +12,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/http-api/interface/config.js b/test/http-api/interface/config.js index 2dc5e28c9f..6ac89facbf 100644 --- a/test/http-api/interface/config.js +++ b/test/http-api/interface/config.js @@ -12,7 +12,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/http-api/interface/files.js b/test/http-api/interface/files.js index 8b67070415..8a80d4c2c1 100644 --- a/test/http-api/interface/files.js +++ b/test/http-api/interface/files.js @@ -12,7 +12,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/http-api/interface/key.js b/test/http-api/interface/key.js index 75d5cf5769..5feb04e412 100644 --- a/test/http-api/interface/key.js +++ b/test/http-api/interface/key.js @@ -8,7 +8,8 @@ const parallel = require('async/parallel') const DaemonFactory = require('ipfsd-ctl') const df = DaemonFactory.create({ exec: 'src/cli/bin.js' }) const options = { - args: ['--pass', 'ipfs-is-awesome-software'] + args: ['--pass', 'ipfs-is-awesome-software'], + initOptions: { bits: 512 } } const nodes = [] diff --git a/test/http-api/interface/object.js b/test/http-api/interface/object.js index 5db1e53f97..756c0a23b3 100644 --- a/test/http-api/interface/object.js +++ b/test/http-api/interface/object.js @@ -12,7 +12,9 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn((err, _ipfsd) => { + df.spawn({ + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/http-api/interface/pubsub.js b/test/http-api/interface/pubsub.js index b058c1a63c..19e9384246 100644 --- a/test/http-api/interface/pubsub.js +++ b/test/http-api/interface/pubsub.js @@ -12,15 +12,17 @@ const common = { setup: function (callback) { callback(null, { spawnNode: (cb) => { - df.spawn({ args: ['--enable-pubsub-experiment'] }, - (err, _ipfsd) => { - if (err) { - return cb(err) - } + df.spawn({ + args: ['--enable-pubsub-experiment'], + initOptions: { bits: 512 } + }, (err, _ipfsd) => { + if (err) { + return cb(err) + } - nodes.push(_ipfsd) - cb(null, _ipfsd.api) - }) + nodes.push(_ipfsd) + cb(null, _ipfsd.api) + }) } }) }, diff --git a/test/http-api/interface/swarm.js b/test/http-api/interface/swarm.js index e2a9b657c7..568a41a64f 100644 --- a/test/http-api/interface/swarm.js +++ b/test/http-api/interface/swarm.js @@ -22,7 +22,11 @@ const common = { config = undefined } - df.spawn({ repoPath, config }, (err, _ipfsd) => { + df.spawn({ + repoPath, + config, + initOptions: { bits: 512 } + }, (err, _ipfsd) => { if (err) { return cb(err) } diff --git a/test/utils/on-and-off.js b/test/utils/on-and-off.js index 4aa6344eeb..233223eafe 100644 --- a/test/utils/on-and-off.js +++ b/test/utils/on-and-off.js @@ -49,7 +49,11 @@ function on (tests) { // before step this.timeout(60 * 1000) - df.spawn({ type: 'js', exec: `./src/cli/bin.js` }, (err, node) => { + df.spawn({ + type: 'js', + exec: `./src/cli/bin.js`, + initOptions: { bits: 512 } + }, (err, node) => { expect(err).to.not.exist() ipfsd = node thing.ipfs = ipfsExec(node.repoPath)