From ac83fa5f5a6266445ff6dab7272a1b938a6fd5a2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 12 May 2019 14:44:18 +0200 Subject: [PATCH] protocol as name --- StrategySpace/TradingSystem.js | 11 +++++++---- StrategySpace/Workspace.js | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/StrategySpace/TradingSystem.js b/StrategySpace/TradingSystem.js index c06e3912c..9b8e38174 100644 --- a/StrategySpace/TradingSystem.js +++ b/StrategySpace/TradingSystem.js @@ -3,7 +3,7 @@ function newTradingSystem () { const MODULE_NAME = 'Trading System' let thisObject = { - tradingSystem: undefined, + protocolData: undefined, container: undefined, getContainer: getContainer, initialize: initialize, @@ -26,10 +26,13 @@ function newTradingSystem () { function finalize () { destroyStrategyParts() + thisObject.protocolData = undefined + thisObject.container.finalize() + thisObject.container = undefined } function initialize (strategies) { - thisObject.tradingSystem = { + thisObject.protocolData = { strategies: strategies } generateStrategyParts() @@ -80,7 +83,7 @@ function newTradingSystem () { function generateStrategyParts () { let lastPhase - let tradingSystem = thisObject.tradingSystem + let tradingSystem = thisObject.protocolData createPart('Trading System', '', tradingSystem, undefined, undefined) @@ -171,7 +174,7 @@ function newTradingSystem () { } function destroyStrategyParts () { - let strategy = thisObject.tradingSystem + let strategy = thisObject.protocolData destroyPart(strategy) destroyPart(strategy.entryPoint) diff --git a/StrategySpace/Workspace.js b/StrategySpace/Workspace.js index 11ede6092..27ec027d2 100644 --- a/StrategySpace/Workspace.js +++ b/StrategySpace/Workspace.js @@ -63,7 +63,7 @@ function newWorkspace () { /* Getting the FB that own the Strategies */ - let strategySimulationClone = '' + let tradingSystemSimulationClone = '' let clones = window.localStorage.getItem('userClones') if (clones === null || clones === '') { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> no user clones found at local storage. Can not get Strategies without them. ') } @@ -73,7 +73,7 @@ function newWorkspace () { for (let i = 0; i < clones.length; i++) { let clone = clones[i] if (clone.botType === 'Indicator') { - strategySimulationClone = clone.botSlug + tradingSystemSimulationClone = clone.botSlug } } @@ -96,7 +96,7 @@ function newWorkspace () { return new Promise((resolve, reject) => { apolloClient.query({ query: GRAPHQL_QUERY_GET_STRATEGIES, - variables: { fbSlug: strategySimulationClone} + variables: { fbSlug: tradingSystemSimulationClone} }) .then(response => { window.localStorage.setItem('userStrategies', JSON.stringify(response.data.strategizer_StrategyByFb.subStrategies)) @@ -128,8 +128,8 @@ function newWorkspace () { } function deploydTradingSystem () { - thisObject.strategy = newTradingSystem() - thisObject.strategy.initialize(thisObject.strategies) + thisObject.tradingSystem = newTradingSystem() + thisObject.tradingSystem.initialize(thisObject.strategies) thisObject.isDeployed = true }