From cd2e49bb60d8cea4d51afc7dd65ac28e74f20f37 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 10 Apr 2022 09:46:23 +0200
Subject: [PATCH] Simplify downloading futures data code

---
 freqtrade/data/history/history_utils.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/freqtrade/data/history/history_utils.py b/freqtrade/data/history/history_utils.py
index 515a345f1..8560fd29e 100644
--- a/freqtrade/data/history/history_utils.py
+++ b/freqtrade/data/history/history_utils.py
@@ -179,6 +179,7 @@ def _download_pair_history(pair: str, *,
                            data_handler: IDataHandler = None,
                            timerange: Optional[TimeRange] = None,
                            candle_type: CandleType,
+                           erase: bool = False,
                            ) -> bool:
     """
     Download latest candles from the exchange for the pair and timeframe passed in parameters
@@ -192,11 +193,16 @@ def _download_pair_history(pair: str, *,
     :param timeframe: Timeframe (e.g "5m")
     :param timerange: range of time to download
     :param candle_type: Any of the enum CandleType (must match trading mode!)
+    :param erase: Erase existing data
     :return: bool with success state
     """
     data_handler = get_datahandler(datadir, data_handler=data_handler)
 
     try:
+        if erase:
+            if data_handler.ohlcv_purge(pair, timeframe, candle_type=candle_type):
+                logger.info(f'Deleting existing data for pair {pair}, {timeframe}, {candle_type}.')
+
         logger.info(
             f'Download history data for pair: "{pair}" ({process}), timeframe: {timeframe}, '
             f'candle type: {candle_type} and store in {datadir}.'
@@ -267,35 +273,28 @@ def refresh_backtest_ohlcv_data(exchange: Exchange, pairs: List[str], timeframes
             continue
         for timeframe in timeframes:
 
-            if erase:
-                if data_handler.ohlcv_purge(pair, timeframe, candle_type=candle_type):
-                    logger.info(f'Deleting existing data for pair {pair}, interval {timeframe}.')
-
             logger.info(f'Downloading pair {pair}, interval {timeframe}.')
             process = f'{idx}/{len(pairs)}'
             _download_pair_history(pair=pair, process=process,
                                    datadir=datadir, exchange=exchange,
                                    timerange=timerange, data_handler=data_handler,
                                    timeframe=str(timeframe), new_pairs_days=new_pairs_days,
-                                   candle_type=candle_type)
+                                   candle_type=candle_type,
+                                   erase=erase)
         if trading_mode == 'futures':
             # Predefined candletype (and timeframe) depending on exchange
             # Downloads what is necessary to backtest based on futures data.
-            timeframe = exchange._ft_has['mark_ohlcv_timeframe']
+            tf_mark = exchange._ft_has['mark_ohlcv_timeframe']
             fr_candle_type = CandleType.from_string(exchange._ft_has['mark_ohlcv_price'])
             # All exchanges need FundingRate for futures trading.
             # The timeframe is aligned to the mark-price timeframe.
             for funding_candle_type in (CandleType.FUNDING_RATE, fr_candle_type):
-                # TODO: this could be in most parts to the above.
-                if erase:
-                    if data_handler.ohlcv_purge(pair, timeframe, candle_type=funding_candle_type):
-                        logger.info(
-                            f'Deleting existing data for pair {pair}, interval {timeframe}.')
                 _download_pair_history(pair=pair, process=process,
                                        datadir=datadir, exchange=exchange,
                                        timerange=timerange, data_handler=data_handler,
-                                       timeframe=str(timeframe), new_pairs_days=new_pairs_days,
-                                       candle_type=funding_candle_type)
+                                       timeframe=str(tf_mark), new_pairs_days=new_pairs_days,
+                                       candle_type=funding_candle_type,
+                                       erase=erase)
 
     return pairs_not_available