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

Merge pull request #604 from embark-framework/bug_fix/syncModepatch 

Bug fix/sync modepatch
This commit is contained in:
Jonathan Rainville 2018-07-06 10:46:52 -04:00 committed by GitHub
parent 5bb1d33739 da01ab15db
commit b426d1c6d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ var Blockchain = function(options) {
vmdebug: this.blockchainConfig.vmdebug || false, vmdebug: this.blockchainConfig.vmdebug || false,
targetGasLimit: this.blockchainConfig.targetGasLimit || false, targetGasLimit: this.blockchainConfig.targetGasLimit || false,
syncMode: this.blockchainConfig.syncMode, syncMode: this.blockchainConfig.syncMode,
syncmode: this.blockchainConfig.syncmode,
verbosity: this.blockchainConfig.verbosity verbosity: this.blockchainConfig.verbosity
}; };

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

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

4
templates/boilerplate/config/blockchain.js
View File

@ -30,7 +30,7 @@ module.exports = {
testnet: { testnet: {
enabled: true, enabled: true,
networkType: "testnet", networkType: "testnet",
light: true, syncMode: "light",
rpcHost: "localhost", rpcHost: "localhost",
rpcPort: 8545, rpcPort: 8545,
rpcCorsDomain: "http://localhost:8000", rpcCorsDomain: "http://localhost:8000",
@ -41,7 +41,7 @@ module.exports = {
livenet: { livenet: {
enabled: true, enabled: true,
networkType: "livenet", networkType: "livenet",
light: true, syncMode: "light",
rpcHost: "localhost", rpcHost: "localhost",
rpcPort: 8545, rpcPort: 8545,
rpcCorsDomain: "http://localhost:8000", rpcCorsDomain: "http://localhost:8000",

4
templates/demo/config/blockchain.js
View File

@ -30,7 +30,7 @@ module.exports = {
testnet: { testnet: {
enabled: true, enabled: true,
networkType: "testnet", networkType: "testnet",
light: true, syncMode: "light",
rpcHost: "localhost", rpcHost: "localhost",
rpcPort: 8545, rpcPort: 8545,
rpcCorsDomain: "http://localhost:8000", rpcCorsDomain: "http://localhost:8000",
@ -41,7 +41,7 @@ module.exports = {
livenet: { livenet: {
enabled: true, enabled: true,
networkType: "livenet", networkType: "livenet",
light: true, syncMode: "light",
rpcHost: "localhost", rpcHost: "localhost",
rpcPort: 8545, rpcPort: 8545,
rpcCorsDomain: "http://localhost:8000", rpcCorsDomain: "http://localhost:8000",

2
test/blockchain.js
View File

@ -39,6 +39,7 @@ describe('embark.Blockchain', function () {
wsRPC: true, wsRPC: true,
targetGasLimit: false, targetGasLimit: false,
syncMode: undefined, syncMode: undefined,
syncmode: undefined,
verbosity: undefined, verbosity: undefined,
proxy: true proxy: true
}; };
@ -81,6 +82,7 @@ describe('embark.Blockchain', function () {
wsRPC: true, wsRPC: true,
targetGasLimit: false, targetGasLimit: false,
syncMode: undefined, syncMode: undefined,
syncmode: undefined,
verbosity: undefined, verbosity: undefined,
proxy: true proxy: true
}; };