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

feat: use reduced keysize #698

Merged
merged 5 commits into from
Mar 6, 2018
Merged

feat: use reduced keysize #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4c68be
feat: use reduced keysize
dryajov Feb 21, 2018
a01f739
chore: use --max-old-space-size to run tests
dryajov Feb 21, 2018
b75509c
chore: update ipfsd-ctl dep
dryajov Feb 21, 2018
3b4f093
fix: use NODE_OPTIONS to pass node options
dryajov Feb 23, 2018
6c951a2
feat: add ipfs as dev dependency to get the latest version
dryajov Mar 5, 2018
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
22 changes: 12 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

},
"dependencies": {
"async": "^2.6.0",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/bitswap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/commands.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/constructor.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion test/diag.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/files.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/get.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/interface/block.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/bootstrap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/config.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/dht.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/files-mfs.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/files.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/key.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/miscellaneous.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/object.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/pin.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/pubsub.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/interface/repo.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/stats.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/interface/swarm.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion test/key.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/log.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test/name.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ 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)
cb()
})
},
(cb) => {
f.spawn((err, node) => {
f.spawn({ initOptions: { bits: 1024 } }, (err, node) => {
expect(err).to.not.exist()
other = node.api
otherd = node
Expand Down
4 changes: 2 additions & 2 deletions test/ping.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/pubsub-in-browser.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/refs.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/repo.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/stats.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/util.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down