embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #541 from embark-framework/bug_fix/testnet-hang 

remove deprecated geth params
This commit is contained in:
Iuri Matias 2018-06-15 16:46:16 -04:00 committed by GitHub
parent dae9e4ae7f 7d94e4efee
commit 5ee9843973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cmds/blockchain/blockchain.js
View File

@ -44,8 +44,7 @@ var Blockchain = function(options) {
wsApi: (this.blockchainConfig.wsApi || ['eth', 'web3', 'net', 'shh']), wsApi: (this.blockchainConfig.wsApi || ['eth', 'web3', 'net', 'shh']),
vmdebug: this.blockchainConfig.vmdebug || false, vmdebug: this.blockchainConfig.vmdebug || false,
targetGasLimit: this.blockchainConfig.targetGasLimit || false, targetGasLimit: this.blockchainConfig.targetGasLimit || false,
light: this.blockchainConfig.light || false, syncMode: this.blockchainConfig.syncMode,
fast: this.blockchainConfig.fast || false,
verbosity: this.blockchainConfig.verbosity verbosity: this.blockchainConfig.verbosity
}; };

8
lib/cmds/blockchain/geth_commands.js
View File

@ -20,12 +20,8 @@ class GethCommands {
cmd.push(`--datadir=${config.datadir}`); cmd.push(`--datadir=${config.datadir}`);
} }
if (config.light) { if (config.syncMode) {
cmd.push("--light"); cmd.push("--syncmode=" + config.syncMode);
}
if (config.fast) {
cmd.push("--fast");
} }
if (config.account && config.account.password) { if (config.account && config.account.password) {

6
test/blockchain.js
View File

@ -38,8 +38,7 @@ describe('embark.Blockchain', function () {
wsPort: 8546, wsPort: 8546,
wsRPC: true, wsRPC: true,
targetGasLimit: false, targetGasLimit: false,
fast: false, syncMode: undefined,
light: false,
verbosity: undefined, verbosity: undefined,
proxy: true proxy: true
}; };
@ -81,8 +80,7 @@ describe('embark.Blockchain', function () {
wsPort: 8546, wsPort: 8546,
wsRPC: true, wsRPC: true,
targetGasLimit: false, targetGasLimit: false,
fast: false, syncMode: undefined,
light: false,
verbosity: undefined, verbosity: undefined,
proxy: true proxy: true
}; };

6
test_apps/contracts_app/blockchain.json
View File

@ -26,8 +26,7 @@
"networkType": "testnet", "networkType": "testnet",
"rpcHost": "localhost", "rpcHost": "localhost",
"rpcPort": 8545, "rpcPort": 8545,
"light": true, "syncMode": "fast",
"fast": true,
"account": { "account": {
"password": "config/ropsten/password" "password": "config/ropsten/password"
} }
@ -36,8 +35,7 @@
"networkType": "rinkeby", "networkType": "rinkeby",
"rpcHost": "localhost", "rpcHost": "localhost",
"rpcPort": 8545, "rpcPort": 8545,
"light": true, "syncMode": "fast",
"fast": true,
"account": { "account": {
"password": "config/rinkeby/password" "password": "config/rinkeby/password"
} }

6
test_apps/test_app/config/blockchain.json
View File

@ -26,8 +26,7 @@
"networkType": "testnet", "networkType": "testnet",
"rpcHost": "localhost", "rpcHost": "localhost",
"rpcPort": 8545, "rpcPort": 8545,
"light": true, "syncMode": "fast",
"fast": true,
"account": { "account": {
"password": "config/ropsten/password" "password": "config/ropsten/password"
} }
@ -36,8 +35,7 @@
"networkType": "rinkeby", "networkType": "rinkeby",
"rpcHost": "localhost", "rpcHost": "localhost",
"rpcPort": 8545, "rpcPort": 8545,
"light": true, "syncMode": "fast",
"fast": true,
"account": { "account": {
"password": "config/rinkeby/password" "password": "config/rinkeby/password"
} }