From b2c241e607317baf147806824c838952632e5722 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Mon, 1 Jun 2020 20:43:20 +0200
Subject: [PATCH] Replace ticker_interval in all rpc files

---
 freqtrade/rpc/rpc.py            | 3 ++-
 freqtrade/rpc/rpc_manager.py    | 4 ++--
 freqtrade/rpc/telegram.py       | 2 +-
 tests/rpc/test_rpc.py           | 2 ++
 tests/rpc/test_rpc_apiserver.py | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index 6addf18ba..e7d4a3be8 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -101,7 +101,8 @@ class RPC:
             'trailing_stop_positive': config.get('trailing_stop_positive'),
             'trailing_stop_positive_offset': config.get('trailing_stop_positive_offset'),
             'trailing_only_offset_is_reached': config.get('trailing_only_offset_is_reached'),
-            'ticker_interval': config['ticker_interval'],
+            'ticker_interval': config['timeframe'],  # DEPRECATED
+            'timeframe': config['timeframe'],
             'exchange': config['exchange']['name'],
             'strategy': config['strategy'],
             'forcebuy_enabled': config.get('forcebuy_enable', False),
diff --git a/freqtrade/rpc/rpc_manager.py b/freqtrade/rpc/rpc_manager.py
index 670275991..2cb44fec8 100644
--- a/freqtrade/rpc/rpc_manager.py
+++ b/freqtrade/rpc/rpc_manager.py
@@ -72,7 +72,7 @@ class RPCManager:
         minimal_roi = config['minimal_roi']
         stoploss = config['stoploss']
         trailing_stop = config['trailing_stop']
-        ticker_interval = config['ticker_interval']
+        timeframe = config['timeframe']
         exchange_name = config['exchange']['name']
         strategy_name = config.get('strategy', '')
         self.send_msg({
@@ -81,7 +81,7 @@ class RPCManager:
                       f'*Stake per trade:* `{stake_amount} {stake_currency}`\n'
                       f'*Minimum ROI:* `{minimal_roi}`\n'
                       f'*{"Trailing " if trailing_stop else ""}Stoploss:* `{stoploss}`\n'
-                      f'*Ticker Interval:* `{ticker_interval}`\n'
+                      f'*Timeframe:* `{timeframe}`\n'
                       f'*Strategy:* `{strategy_name}`'
         })
         self.send_msg({
diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index 7eef18dfc..17354cdb0 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -639,7 +639,7 @@ class Telegram(RPC):
             f"*Max open Trades:* `{val['max_open_trades']}`\n"
             f"*Minimum ROI:* `{val['minimal_roi']}`\n"
             f"{sl_info}"
-            f"*Ticker Interval:* `{val['ticker_interval']}`\n"
+            f"*Timeframe:* `{val['timeframe']}`\n"
             f"*Strategy:* `{val['strategy']}`\n"
             f"*Current state:* `{val['state']}`"
         )
diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py
index 7b7824310..4950c4ea7 100644
--- a/tests/rpc/test_rpc.py
+++ b/tests/rpc/test_rpc.py
@@ -66,6 +66,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'max_rate': ANY,
         'strategy': ANY,
         'ticker_interval': ANY,
+        'timeframe': ANY,
         'open_order_id': ANY,
         'close_date': None,
         'close_date_hum': None,
@@ -120,6 +121,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'max_rate': ANY,
         'strategy': ANY,
         'ticker_interval': ANY,
+        'timeframe': ANY,
         'open_order_id': ANY,
         'close_date': None,
         'close_date_hum': None,
diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py
index c7f937b0c..bccd12e18 100644
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -544,6 +544,7 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
                         'sell_order_status': None,
                         'strategy': 'DefaultStrategy',
                         'ticker_interval': 5,
+                        'timeframe': 5,
                         'exchange': 'bittrex',
                         }]
 
@@ -659,6 +660,7 @@ def test_api_forcebuy(botclient, mocker, fee):
                        'sell_order_status': None,
                        'strategy': None,
                        'ticker_interval': None,
+                       'timeframe': None,
                        'exchange': 'bittrex',
                        }