From 2c5359bb54c34e507c2006a0d919101d492a8819 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 31 Oct 2020 21:02:22 +0100 Subject: [PATCH] Refactoring --- LowFrequencyTrading/OrdersSimulations.js | 6 +++--- Session.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LowFrequencyTrading/OrdersSimulations.js b/LowFrequencyTrading/OrdersSimulations.js index 5aafb1908..5f6b5d12e 100644 --- a/LowFrequencyTrading/OrdersSimulations.js +++ b/LowFrequencyTrading/OrdersSimulations.js @@ -83,7 +83,7 @@ exports.newOrdersSimulations = function newOrdersSimulations(bot, logger) { case 'Market Order': { /* Actual Rate is simulated based on the Session Paremeters */ - let slippageAmount = tradingEngineOrder.rate.value * sessionParameters.slippage.config.positionRate / 100 + let slippageAmount = tradingEngineOrder.rate.value * sessionParameters.slippage.config.marketOrderRate / 100 if (slippageAmount !== 0) { switch (tradingSystemOrder.type) { case 'Market Sell Order': { @@ -93,7 +93,7 @@ exports.newOrdersSimulations = function newOrdersSimulations(bot, logger) { tradingSystem.warnings.push( [ [sessionParameters.slippage.id, tradingEngineOrder.rate.id, tradingEngineOrder.orderStatistics.actualRate.id], - 'slippage.config.positionRate Slippage Amount (' + slippageAmount + ') substracted from Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ')' + 'slippage.config.marketOrderRate Slippage Amount (' + slippageAmount + ') substracted from Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ')' ] ) break @@ -105,7 +105,7 @@ exports.newOrdersSimulations = function newOrdersSimulations(bot, logger) { tradingSystem.warnings.push( [ [sessionParameters.slippage.id, tradingEngineOrder.rate.id, tradingEngineOrder.orderStatistics.actualRate.id], - 'slippage.config.positionRate Slippage Amount (' + slippageAmount + ') added to Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ')' + 'slippage.config.marketOrderRate Slippage Amount (' + slippageAmount + ') added to Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ')' ] ) break diff --git a/Session.js b/Session.js index e35d08c1b..a0ad50e64 100644 --- a/Session.js +++ b/Session.js @@ -326,14 +326,14 @@ name: 'Missing Slippage', type: 'Slippage', config: { - positionRate: 0, + marketOrderRate: 0, stopLoss: 0, takeProfit: 0 } } } - if (bot.SESSION.parameters.slippage.config.positionRate === undefined) { // if the positionRate is missing we create a default one. - bot.SESSION.parameters.slippage.config.positionRate = 0 + if (bot.SESSION.parameters.slippage.config.marketOrderRate === undefined) { // if the marketOrderRate is missing we create a default one. + bot.SESSION.parameters.slippage.config.marketOrderRate = 0 } if (bot.SESSION.parameters.slippage.config.stopLoss === undefined) { // if the stopLoss is missing we create a default one. bot.SESSION.parameters.slippage.config.stopLoss = 0