From cdee253fdaf461113c1a4555206688d30c6ad520 Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Wed, 2 Feb 2022 10:54:53 +0300 Subject: [PATCH] fixes implemented --- user_data/strategies/Strategy002.py | 5 +++-- user_data/strategies/Strategy003.py | 5 +++-- user_data/strategies/Strategy004.py | 5 +++-- user_data/strategies/notifier.py | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index b1d89bc3c..17c16e333 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -15,11 +15,12 @@ from datetime import datetime from user_data.strategies.util import execute, back_test from user_data.strategies.config import Config -from user_data.strategies.notifier import send_backtest_start_deliminator_message +from user_data.strategies.notifier import send_start_deliminator_message class Strategy002(IStrategy): - send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + if Config.IS_BACKTEST: + send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 002 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 2c0bf7995..1a916589a 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -15,11 +15,12 @@ from datetime import datetime from user_data.strategies.util import back_test, execute from user_data.strategies.config import Config -from user_data.strategies.notifier import send_backtest_start_deliminator_message +from user_data.strategies.notifier import send_start_deliminator_message class Strategy003(IStrategy): - send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + if Config.IS_BACKTEST: + send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 003 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy004.py b/user_data/strategies/Strategy004.py index 5a440f43f..a875e5f50 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -12,11 +12,12 @@ import talib.abstract as ta from user_data.strategies.util import back_test, execute from user_data.strategies.config import Config -from user_data.strategies.notifier import send_backtest_start_deliminator_message +from user_data.strategies.notifier import send_start_deliminator_message class Strategy004(IStrategy): - send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + if Config.IS_BACKTEST: + send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 004 author@: Gerald Lonlas diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py index 87cab1ec3..57df3cc57 100644 --- a/user_data/strategies/notifier.py +++ b/user_data/strategies/notifier.py @@ -4,8 +4,8 @@ sys.path.append('/root/workspace2/execution/') from config import Config -def send_backtest_start_deliminator_message(action, coin, month, year): - print("notifier: send_backtest_start_deliminator_message: action= " + str(action)) +def send_start_deliminator_message(action, coin, month, year): + print("notifier: send_start_deliminator_message: action= " + str(action)) text = "=========" + str(coin) + " " + str(month) + " " + str(year) + "=========>" result = requests.post('https://api.telegram.org/bot' + Config.NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST +