From 648382bd15f806b08ae7902b2161f6c8a8fd3c2a Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 9 Feb 2016 15:45:48 -0500 Subject: [PATCH] fix blockchain config specs --- lib/config/blockchain.js | 4 ++-- test/config.blockchain.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/config/blockchain.js b/lib/config/blockchain.js index 1cc9dd82b..d2110ed2f 100644 --- a/lib/config/blockchain.js +++ b/lib/config/blockchain.js @@ -38,8 +38,7 @@ BlockchainConfig.prototype.config = function(env) { gasLimit: config.gas_limit || 500000, gasPrice: config.gas_price || 10000000000000, rpcWhitelist: config.rpc_whitelist, - nat: config.nat, - mine: config.mine, + nat: config.nat || [], minerthreads: config.minerthreads, genesisBlock: config.genesis_block, datadir: config.datadir, @@ -48,6 +47,7 @@ BlockchainConfig.prototype.config = function(env) { deployTimeout: config.deploy_timeout || 20, networkId: networkId, maxPeers: config.max_peers || 4, + mine: config.mine || false, port: config.port || "30303", console_toggle: config.console || false, mine_when_needed: config.mine_when_needed || false, diff --git a/test/config.blockchain.js b/test/config.blockchain.js index 127d00032..94b6a1f90 100644 --- a/test/config.blockchain.js +++ b/test/config.blockchain.js @@ -69,12 +69,14 @@ describe('embark.config.blockchain', function() { bootNodes: [], whisper: false, minerthreads: 1, + nat: [], genesisBlock: 'config/genesis.json', datadir: '/tmp/embark', chains: 'chains_development.json', deployTimeout: 45, networkId: 0, maxPeers: 4, + mine: false, port: "30303", console_toggle: false, mine_when_needed: true, @@ -118,12 +120,14 @@ describe('embark.config.blockchain', function() { bootNodes: [], whisper: false, minerthreads: 1, + nat: [], genesisBlock: undefined, datadir: '/tmp/embark', chains: undefined, deployTimeout: 20, networkId: 0, maxPeers: 4, + mine: false, port: "30303", console_toggle: false, mine_when_needed: true,