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

remove deprecated geth params

lib/cmds/blockchain/blockchain.js

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

lib/cmds/blockchain/geth_commands.js

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

test/blockchain.js

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

test_apps/contracts_app/blockchain.json

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

test_apps/test_app/config/blockchain.json

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