Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

fix: issue-858 #859

Merged
merged 1 commit into from
May 21, 2017
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
5 changes: 2 additions & 3 deletions src/core/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ module.exports = (self) => {
const repoOpen = !self._repo.closed

const customInitOptions = typeof options.init === 'object' ? options.init : {}
const initOptions = Object.assign({
bits: 2048
}, customInitOptions)
const initOptions = Object.assign({ bits: 2048 }, customInitOptions)

// Checks if a repo exists, and if so opens it
// Will return callback with a bool indicating the existence
Expand Down Expand Up @@ -88,6 +86,7 @@ module.exports = (self) => {
(cb) => self.config.get(cb),
(config, cb) => {
extend(config, options.config)

self.config.replace(config, cb)
}
], cb)
Expand Down
6 changes: 3 additions & 3 deletions src/core/components/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ module.exports = function init (self) {

parallel(tasks, (err) => {
if (err) {
return cb(err)
cb(err)
} else {
cb(null, true)
}

cb(null, true)
})
}
], done)
Expand Down
1 change: 0 additions & 1 deletion src/init-files/default-config-browser.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"Enabled": true
}
},
"Discovery": {},
"Bootstrap": [
"/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd",
"/dns4/sfo-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx",
Expand Down