diff --git a/Trading/TradingBot.js b/Trading/TradingBot.js index e4cd291ee..30eefe350 100644 --- a/Trading/TradingBot.js +++ b/Trading/TradingBot.js @@ -128,9 +128,11 @@ exports.newTradingBot = function newTradingBot(bot, logger, UTILITIES, FILE_STOR let tradingSystem = {} - if (s === true) { + if (bot.RESUME === true) { readFiles() } else { + simulationState.tradingEngine = bot.SESSION.tradingEngine + simulationState.tradingSystem = bot.SESSION.tradingSystem runSimulation() } diff --git a/Trading/TradingSimulation.js b/Trading/TradingSimulation.js index d0983d6a0..dc71a3726 100644 --- a/Trading/TradingSimulation.js +++ b/Trading/TradingSimulation.js @@ -25,7 +25,7 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT timeFrame, timeFrameLabel, currentDay, - s, + simulationState, exchangeAPI, recordsArray, conditionsArray, @@ -42,8 +42,8 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT processingDailyFiles = true } - let tradingSystem = bot.TRADING_SYSTEM - let tradingEngine = bot.TRADING_ENGINE + let tradingSystem = simulationState.tradingSystem + let tradingEngine = simulationState.tradingEngine let sessionParameters = bot.SESSION.parameters if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> initialDatetime = ' + sessionParameters.timeRange.config.initialDatetime) }