Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove default key size and upgrade go-ipfs-dep #504

Merged
merged 2 commits into from
Apr 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions examples/electron-asar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"private": true,
"main": "./app.js",
"dependencies": {
"go-ipfs-dep": "github:ipfs/npm-go-ipfs-dep#add-path-function-to-detect-binary",
"ipfs": "^0.39.0-rc.2",
"go-ipfs-dep": "^0.5.0",
"ipfs": "^0.43.0",
"ipfsd-ctl": "file:../.."
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"devDependencies": {
"aegir": "^21.9.0",
"benchmark": "^2.1.4",
"go-ipfs-dep": "0.4.23-3",
"go-ipfs-dep": "^0.5.0",
"husky": "^4.2.5",
"ipfs": "^0.43.0",
"ipfs-http-client": "^44.0.0",
Expand Down
1 change: 0 additions & 1 deletion src/ipfsd-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ class Client {
const opts = merge(
{
emptyRepo: false,
bits: this.opts.test ? 1024 : 2048,
profiles: this.opts.test ? ['test'] : []

},
Expand Down
1 change: 0 additions & 1 deletion src/ipfsd-daemon.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ class Daemon {
const opts = merge(
{
emptyRepo: false,
bits: this.opts.test ? 1024 : 2048,
profiles: this.opts.test ? ['test'] : []
},
typeof this.opts.ipfsOptions.init === 'boolean' ? {} : this.opts.ipfsOptions.init,
Expand Down
1 change: 0 additions & 1 deletion src/ipfsd-in-proc.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ class InProc {
const opts = merge(
{
emptyRepo: false,
bits: this.opts.test ? 1024 : 2048,
profiles: this.opts.test ? ['test'] : []
},
typeof this.opts.ipfsOptions.init === 'boolean' ? {} : this.opts.ipfsOptions.init,
Expand Down
48 changes: 0 additions & 48 deletions test/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,6 @@ const suite = new Benchmark.Suite()
const { createNodeTests } = require('../src')

suite
.add('ctl go 1024', {
defer: true,
fn: async (deferred) => {
const node = await createNodeTests({
type: 'go',
ipfsOptions: {
init: {
bits: 1024
}
}
})

await node.stop()
deferred.resolve()
}
})
.add('ctl go 2048', {
defer: true,
fn: async (deferred) => {
Expand All @@ -39,38 +23,6 @@ suite
deferred.resolve()
}
})
.add('ctl js 512', {
defer: true,
fn: async (deferred) => {
const node = await createNodeTests({
type: 'js',
ipfsOptions: {
init: {
bits: 512
}
}
})

await node.stop()
deferred.resolve()
}
})
.add('ctl js 1024', {
defer: true,
fn: async (deferred) => {
const node = await createNodeTests({
type: 'js',
ipfsOptions: {
init: {
bits: 1024
}
}
})

await node.stop()
deferred.resolve()
}
})
.add('ctl js 2048', {
defer: true,
fn: async (deferred) => {
Expand Down
4 changes: 2 additions & 2 deletions test/controller.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ describe('Controller API', function () {
if (opts.type === 'js') {
await expect(ctl.init({
emptyRepo: true,
bits: 1024,
bits: 2048,
profile: ['test'],
pass: 'QmfPjo1bKmpcdWxpQnGAKjeae9F9aCxTDiS61t9a3hmvRi'
})).to.be.fulfilled()
} else {
await expect(ctl.init({
emptyRepo: true,
bits: 1024,
bits: 2048,
profile: ['test']
})).to.be.fulfilled()
}
Expand Down