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.

Sign up for GitHub

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

Jump to bottom

feat: add keysize through an option to spawn #203

Merged
merged 15 commits into from
Feb 21, 2018
Merged

feat: add keysize through an option to spawn #203

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2595fc4
feat: add keysize through env or as an option to spawn
dryajov Feb 16, 2018
718e0ce
fix: lint
dryajov Feb 16, 2018
c9c25da
fix: don't pass on arguments from node executable
vmx Feb 16, 2018
c3fca62
use initOpts istead of reusing init
dryajov Feb 16, 2018
55142c5
feat: replace config on init instead of setting it once for each option
dryajov Feb 17, 2018
17d578e
use cross-env to set env vars and not break windows
dryajov Feb 17, 2018
f5f400e
test: skip multiple start on windows
dryajov Feb 17, 2018
ee74427
test: skip spawn from a initialized repo on windows
dryajov Feb 17, 2018
b167a3c
feat: small changes from review
dryajov Feb 20, 2018
ac70cda
fix: setting keysize on each tests
dryajov Feb 20, 2018
6c7a028
fix: several changes from review
dryajov Feb 21, 2018
2ca9aa1
feat: proc nodes should run whit bits
dryajov Feb 21, 2018
1351dde
fix: dont forget about bits in add retrieve
dryajov Feb 21, 2018
fb30e0e
chore: update ipfs-api
dryajov Feb 21, 2018
174e9dc
timeouts
dryajov Feb 21, 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
5 changes: 3 additions & 2 deletions src/ipfsd-daemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,9 @@ class Daemon {
/**
* Replace the current config with the provided one
*
* @param config
* @param callback
* @param {object} config
* @param {function(Error)} callback
* @return {undefined}
*/
replaceConfig (config, callback) {
const tmpFile = path.join(os.tmpdir(), hat())
Expand Down
5 changes: 3 additions & 2 deletions src/ipfsd-in-proc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,9 @@ class Node {
/**
* Replace the current config with the provided one
*
* @param config
* @param callback
* @param {object} config
* @param {function(Error)} callback
* @return {undefined}
*/
replaceConfig (config, callback) {
this.exec.config.replace(config, callback)
Expand Down
4 changes: 3 additions & 1 deletion test/start-stop.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const fs = require('fs')
const path = require('path')
const os = require('os')
const isrunning = require('is-running')
const JSIPFS = require('ipfs')

const isWindows = os.platform() === 'win32'
const findIpfsExecutable = require('../src/utils/find-ipfs-executable')
Expand Down Expand Up @@ -212,6 +211,9 @@ types.forEach((type) => {
})

describe('start and stop multiple times', () => {
// TODO: wont work on windows until we get /shutdown implemented in js-ipfs
Copy link
Contributor

Choose a reason for hiding this comment

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

It's now working, see PR #205

Copy link
Member Author

Choose a reason for hiding this comment

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

Nice... is it ready to review and merge?

Copy link
Member Author

Choose a reason for hiding this comment

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

do we need to wait for js-ipfs to get released?

Copy link
Member Author

Choose a reason for hiding this comment

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

nvm - ipfs/js-ipfs#1224

Copy link
Contributor

Choose a reason for hiding this comment

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

waiting for a review by @diasdavid

My PR has a link to js-ipfs/master (not using npm) so it can be used immediately.

if (isWindows) { return }
Copy link
Member

Choose a reason for hiding this comment

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

Please use this.skip()

Copy link
Member Author

Choose a reason for hiding this comment

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

Skip doesn't work inside describes only it blocks.

Copy link
Member

Choose a reason for hiding this comment

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

@dryajov can we put that inside every it block then? It signals the viewer that something is not complete.


let ipfsd

before(function (done) {
Expand Down