From 26447c9362a8538c11094cd40f337738156f99d9 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 15 Jun 2018 16:23:55 -0400
Subject: [PATCH 1/3] remove deprecated geth params

---
 test_apps/contracts_app/blockchain.json   | 4 ----
 test_apps/test_app/config/blockchain.json | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/test_apps/contracts_app/blockchain.json b/test_apps/contracts_app/blockchain.json
index c0ef821c8..9770fd6c7 100644
--- a/test_apps/contracts_app/blockchain.json
+++ b/test_apps/contracts_app/blockchain.json
@@ -26,8 +26,6 @@
     "networkType": "testnet",
     "rpcHost": "localhost",
     "rpcPort": 8545,
-    "light": true,
-    "fast": true,
     "account": {
       "password": "config/ropsten/password"
     }
@@ -36,8 +34,6 @@
     "networkType": "rinkeby",
     "rpcHost": "localhost",
     "rpcPort": 8545,
-    "light": true,
-    "fast": true,
     "account": {
       "password": "config/rinkeby/password"
     }
diff --git a/test_apps/test_app/config/blockchain.json b/test_apps/test_app/config/blockchain.json
index aba34f92f..52543588a 100644
--- a/test_apps/test_app/config/blockchain.json
+++ b/test_apps/test_app/config/blockchain.json
@@ -26,8 +26,6 @@
     "networkType": "testnet",
     "rpcHost": "localhost",
     "rpcPort": 8545,
-    "light": true,
-    "fast": true,
     "account": {
       "password": "config/ropsten/password"
     }
@@ -36,8 +34,6 @@
     "networkType": "rinkeby",
     "rpcHost": "localhost",
     "rpcPort": 8545,
-    "light": true,
-    "fast": true,
     "account": {
       "password": "config/rinkeby/password"
     }

From d77083ee8c5dea827d1472335d83e93e78d4432a Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 15 Jun 2018 16:33:59 -0400
Subject: [PATCH 2/3] enable syncMode

---
 lib/cmds/blockchain/blockchain.js         | 3 +--
 lib/cmds/blockchain/geth_commands.js      | 8 ++------
 test_apps/contracts_app/blockchain.json   | 2 ++
 test_apps/test_app/config/blockchain.json | 2 ++
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index 305e1c025..767f04c07 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/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
   };
 
diff --git a/lib/cmds/blockchain/geth_commands.js b/lib/cmds/blockchain/geth_commands.js
index bf94cf228..e6ef57188 100644
--- a/lib/cmds/blockchain/geth_commands.js
+++ b/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) {
diff --git a/test_apps/contracts_app/blockchain.json b/test_apps/contracts_app/blockchain.json
index 9770fd6c7..80394f5f1 100644
--- a/test_apps/contracts_app/blockchain.json
+++ b/test_apps/contracts_app/blockchain.json
@@ -26,6 +26,7 @@
     "networkType": "testnet",
     "rpcHost": "localhost",
     "rpcPort": 8545,
+    "syncMode": "fast",
     "account": {
       "password": "config/ropsten/password"
     }
@@ -34,6 +35,7 @@
     "networkType": "rinkeby",
     "rpcHost": "localhost",
     "rpcPort": 8545,
+    "syncMode": "fast",
     "account": {
       "password": "config/rinkeby/password"
     }
diff --git a/test_apps/test_app/config/blockchain.json b/test_apps/test_app/config/blockchain.json
index 52543588a..cf136e8d4 100644
--- a/test_apps/test_app/config/blockchain.json
+++ b/test_apps/test_app/config/blockchain.json
@@ -26,6 +26,7 @@
     "networkType": "testnet",
     "rpcHost": "localhost",
     "rpcPort": 8545,
+    "syncMode": "fast",
     "account": {
       "password": "config/ropsten/password"
     }
@@ -34,6 +35,7 @@
     "networkType": "rinkeby",
     "rpcHost": "localhost",
     "rpcPort": 8545,
+    "syncMode": "fast",
     "account": {
       "password": "config/rinkeby/password"
     }

From 7d94e4efee4e156f68a160d7827e2080d3b5a298 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 15 Jun 2018 16:40:27 -0400
Subject: [PATCH 3/3] fix tests

---
 test/blockchain.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/blockchain.js b/test/blockchain.js
index 4590236bb..cc92ac359 100644
--- a/test/blockchain.js
+++ b/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
         };