From 9a9a6eaa63d82ab3589a61de5884785d0f675c01 Mon Sep 17 00:00:00 2001 From: robcaulk Date: Sun, 17 Dec 2023 17:44:15 +0100 Subject: [PATCH] Revert "Merge pull request #9450 from freqtrade/fix/startup-candle-count" This reverts commit 15771043f7ed73d7cc85ff2468bf8ef680a242c0, reversing changes made to b417a0297baf1db67b4ee7a57b49bbbc9639f525. --- freqtrade/optimize/backtesting.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index 83e8d3dfe..b8145b6c8 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -147,9 +147,7 @@ class Backtesting: if self.config.get('freqai', {}).get('enabled', False): # For FreqAI, increase the required_startup to includes the training data - self.freqai_startup_candles = self.dataprovider.get_required_startup( - self.timeframe - ) + self.required_startup = self.dataprovider.get_required_startup(self.timeframe) # Add maximum startup candle count to configuration for informative pairs support self.config['startup_candle_count'] = self.required_startup @@ -236,17 +234,12 @@ class Backtesting: """ self.progress.init_step(BacktestState.DATALOAD, 1) - if self.config.get('freqai', {}).get('enabled', False): - startup_candle_count = self.freqai_startup_candles - else: - startup_candle_count = self.required_startup - data = history.load_data( datadir=self.config['datadir'], pairs=self.pairlists.whitelist, timeframe=self.timeframe, timerange=self.timerange, - startup_candles=startup_candle_count, + startup_candles=self.config['startup_candle_count'], fail_without_data=True, data_format=self.config['dataformat_ohlcv'], candle_type=self.config.get('candle_type_def', CandleType.SPOT)