embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-05 02:14:35 +00:00
Code Issues Projects Releases Wiki Activity

fix blockchain config specs

Browse Source
This commit is contained in:
Iuri Matias 2016-02-09 15:45:48 -05:00
parent 2bbd5f418c
commit 648382bd15
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/blockchain.js
View File

@ -38,8 +38,7 @@ BlockchainConfig.prototype.config = function(env) {
gasLimit: config.gas_limit || 500000, gasLimit: config.gas_limit || 500000,
gasPrice: config.gas_price || 10000000000000, gasPrice: config.gas_price || 10000000000000,
rpcWhitelist: config.rpc_whitelist, rpcWhitelist: config.rpc_whitelist,
nat: config.nat, nat: config.nat || [],
mine: config.mine,
minerthreads: config.minerthreads, minerthreads: config.minerthreads,
genesisBlock: config.genesis_block, genesisBlock: config.genesis_block,
datadir: config.datadir, datadir: config.datadir,
@ -48,6 +47,7 @@ BlockchainConfig.prototype.config = function(env) {
deployTimeout: config.deploy_timeout || 20, deployTimeout: config.deploy_timeout || 20,
networkId: networkId, networkId: networkId,
maxPeers: config.max_peers || 4, maxPeers: config.max_peers || 4,
mine: config.mine || false,
port: config.port || "30303", port: config.port || "30303",
console_toggle: config.console || false, console_toggle: config.console || false,
mine_when_needed: config.mine_when_needed || false, mine_when_needed: config.mine_when_needed || false,

4
test/config.blockchain.js
View File

@ -69,12 +69,14 @@ describe('embark.config.blockchain', function() {
bootNodes: [], bootNodes: [],
whisper: false, whisper: false,
minerthreads: 1, minerthreads: 1,
nat: [],
genesisBlock: 'config/genesis.json', genesisBlock: 'config/genesis.json',
datadir: '/tmp/embark', datadir: '/tmp/embark',
chains: 'chains_development.json', chains: 'chains_development.json',
deployTimeout: 45, deployTimeout: 45,
networkId: 0, networkId: 0,
maxPeers: 4, maxPeers: 4,
mine: false,
port: "30303", port: "30303",
console_toggle: false, console_toggle: false,
mine_when_needed: true, mine_when_needed: true,
@ -118,12 +120,14 @@ describe('embark.config.blockchain', function() {
bootNodes: [], bootNodes: [],
whisper: false, whisper: false,
minerthreads: 1, minerthreads: 1,
nat: [],
genesisBlock: undefined, genesisBlock: undefined,
datadir: '/tmp/embark', datadir: '/tmp/embark',
chains: undefined, chains: undefined,
deployTimeout: 20, deployTimeout: 20,
networkId: 0, networkId: 0,
maxPeers: 4, maxPeers: 4,
mine: false,
port: "30303", port: "30303",
console_toggle: false, console_toggle: false,
mine_when_needed: true, mine_when_needed: true,