From 1cae5bb02e2b03c1bb81b96641a08ddaf0d93ef8 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Wed, 11 Jul 2018 13:01:27 -0500 Subject: [PATCH] Embark's own ganache-cli will always be found --- lib/cmds/simulator.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/cmds/simulator.js b/lib/cmds/simulator.js index 7074b0a05..48e4711a2 100644 --- a/lib/cmds/simulator.js +++ b/lib/cmds/simulator.js @@ -14,11 +14,11 @@ class Simulator { const testrpc = shelljs.which('testrpc'); const ganache = shelljs.which('ganache-cli-embark'); - if (!testrpc && !ganache) { - this.logger.warn(__('%s is not installed on your machine', 'Ganache CLI (TestRPC)')); - this.logger.info(__('You can install it by running: %s', 'npm -g install ganache-cli')); - process.exit(); - } + // if (!testrpc && !ganache) { + // this.logger.warn(__('%s is not installed on your machine', 'Ganache CLI (TestRPC)')); + // this.logger.info(__('You can install it by running: %s', 'npm -g install ganache-cli')); + // process.exit(); + // } let useProxy = this.blockchainConfig.proxy || false; let host = (options.host || this.blockchainConfig.rpcHost || 'localhost'); @@ -44,8 +44,10 @@ class Simulator { cmds.push("-b \"" + (simulatorBlocktime) +"\""); } - const programName = ganache ? 'ganache-cli' : 'testrpc'; - const program = ganache ? ganache : testrpc; + // const programName = ganache ? 'ganache-cli' : 'testrpc'; + // const program = ganache ? ganache : testrpc; + const programName = 'ganache-cli'; + const program = ganache; console.log(`running: ${programName} ${cmds.join(' ')}`); shelljs.exec(`${program} ${cmds.join(' ')}`, {async : true});