fix(blockchain): fix setting proxy to false not applying

lib/core/config.js

@@ -208,7 +208,8 @@ Config.prototype.loadBlockchainConfigFile = function() {
     "default": {
       "enabled": true,
       "rpcCorsDomain": "auto",
-      "wsOrigins": "auto"
+      "wsOrigins": "auto",
+      "proxy": true
     }
   };
 

lib/modules/blockchain_process/blockchain.js

@@ -12,7 +12,7 @@ const Ipc = require('../../core/ipc');
 const {defaultHost, dockerHostSwap} = require('../../utils/host');
 const Logger = require('../../core/logger');
 
-// time between IPC connection attmpts (in ms)
+// time between IPC connection attempts (in ms)
 const IPC_CONNECT_INTERVAL = 2000;
 
 /*eslint complexity: ["error", 42]*/
@@ -60,7 +60,7 @@ var Blockchain = function(userConfig, clientClass) {
     targetGasLimit: this.userConfig.targetGasLimit || false,
     syncMode: this.userConfig.syncMode || this.userConfig.syncmode,
     verbosity: this.userConfig.verbosity,
-    proxy: this.userConfig.proxy || true
+    proxy: this.userConfig.proxy
   };
 
   if (this.userConfig === {} || this.userConfig.default || JSON.stringify(this.userConfig) === '{"enabled":true}') {

test/blockchain.js

@@ -41,12 +41,9 @@ describe('embark.Blockchain', function() {
           targetGasLimit: false,
           syncMode: undefined,
           verbosity: undefined,
-          proxy: true,
+          proxy: undefined,
           silent: undefined          
         };
-        // We check also proxy's ports because proxy is set to true
-        expectedConfig.wsPort += constants.blockchain.servicePortOnProxy;
-        expectedConfig.rpcPort += constants.blockchain.servicePortOnProxy;
 
         assert.deepEqual(blockchain.config, expectedConfig);
         done();

test/config.js

@@ -25,6 +25,7 @@ describe('embark.Config', function () {
         "isDev": false,
         "mineWhenNeeded": true,
         "nodiscover": true,
+        "proxy": true,
         "rpcHost": "localhost",
         "rpcPort": 8545,
         "rpcCorsDomain": "http://localhost:8000",
@@ -48,6 +49,7 @@ describe('embark.Config', function () {
         "gasPrice": "8000000",
         "mineWhenNeeded": true,
         "nodiscover": true,
+        "proxy": true,
         "rpcHost": "localhost",
         "rpcPort": 8545,
         "rpcCorsDomain": "http://localhost:8000",
@@ -81,6 +83,7 @@ describe('embark.Config', function () {
         "gasPrice": "8000000",
         "mineWhenNeeded": true,
         "nodiscover": true,
+        "proxy": true,
         "rpcHost": "localhost",
         "rpcPort": 8545,
         "rpcCorsDomain": "http://localhost:8000",