diff --git a/freqtrade/optimize/analysis/lookahead.py b/freqtrade/optimize/analysis/lookahead.py index 70cb6913d..2e7fac421 100755 --- a/freqtrade/optimize/analysis/lookahead.py +++ b/freqtrade/optimize/analysis/lookahead.py @@ -129,7 +129,6 @@ class LookaheadAnalysis(BaseAnalysis): backtesting._set_strategy(backtesting.strategylist[0]) varholder.data, varholder.timerange = backtesting.load_bt_data() - backtesting.load_bt_data_detail() varholder.timeframe = backtesting.timeframe varholder.indicators = backtesting.strategy.advise_all_indicators(varholder.data) diff --git a/freqtrade/optimize/analysis/recursive.py b/freqtrade/optimize/analysis/recursive.py index 50d1b75d6..4d164d8b4 100644 --- a/freqtrade/optimize/analysis/recursive.py +++ b/freqtrade/optimize/analysis/recursive.py @@ -149,7 +149,6 @@ class RecursiveAnalysis(BaseAnalysis): backtesting._set_strategy(backtesting.strategylist[0]) varholder.data, varholder.timerange = backtesting.load_bt_data() - backtesting.load_bt_data_detail() varholder.timeframe = backtesting.timeframe varholder.indicators = backtesting.strategy.advise_all_indicators(varholder.data) diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index f7eedbdf8..cbc77604b 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -315,9 +315,10 @@ class Backtesting: ) self.progress.set_new_value(1) + self._load_bt_data_detail() return data, self.timerange - def load_bt_data_detail(self) -> None: + def _load_bt_data_detail(self) -> None: """ Loads backtest detail data (smaller timeframe) if necessary. """ @@ -1767,7 +1768,6 @@ class Backtesting: data: dict[str, DataFrame] = {} data, timerange = self.load_bt_data() - self.load_bt_data_detail() logger.info("Dataload complete. Calculating indicators") self.load_prior_backtest() diff --git a/freqtrade/optimize/hyperopt/hyperopt_optimizer.py b/freqtrade/optimize/hyperopt/hyperopt_optimizer.py index d46859ee7..149ece8f7 100644 --- a/freqtrade/optimize/hyperopt/hyperopt_optimizer.py +++ b/freqtrade/optimize/hyperopt/hyperopt_optimizer.py @@ -423,7 +423,6 @@ class HyperOptimizer: def prepare_hyperopt_data(self) -> None: HyperoptStateContainer.set_state(HyperoptState.DATALOAD) data, self.timerange = self.backtesting.load_bt_data() - self.backtesting.load_bt_data_detail() logger.info("Dataload complete. Calculating indicators") if not self.analyze_per_epoch: diff --git a/freqtrade/rpc/api_server/api_backtest.py b/freqtrade/rpc/api_server/api_backtest.py index 07d1076bd..98a7586df 100644 --- a/freqtrade/rpc/api_server/api_backtest.py +++ b/freqtrade/rpc/api_server/api_backtest.py @@ -62,7 +62,6 @@ def __run_backtest_bg(btconfig: Config): from freqtrade.optimize.backtesting import Backtesting ApiBG.bt["bt"] = Backtesting(btconfig) - ApiBG.bt["bt"].load_bt_data_detail() else: ApiBG.bt["bt"].config = btconfig ApiBG.bt["bt"].init_backtest() diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py index aadb7e157..2973a4a49 100644 --- a/tests/optimize/test_backtesting.py +++ b/tests/optimize/test_backtesting.py @@ -992,7 +992,7 @@ def test_backtest_one_detail_futures( timerange=timerange, candle_type=CandleType.FUTURES, ) - backtesting.load_bt_data_detail() + backtesting._load_bt_data_detail() processed = backtesting.strategy.advise_all_indicators(data) min_date, max_date = get_timerange(processed) @@ -1120,7 +1120,7 @@ def test_backtest_one_detail_futures_funding_fees( timerange=timerange, candle_type=CandleType.FUTURES, ) - backtesting.load_bt_data_detail() + backtesting._load_bt_data_detail() processed = backtesting.strategy.advise_all_indicators(data) min_date, max_date = get_timerange(processed)