From a26c82b7cc418a443036b46d2a57e36dd808246c Mon Sep 17 00:00:00 2001 From: Wade Dyck Date: Mon, 27 Dec 2021 16:51:02 -0700 Subject: [PATCH] Also check candle_type_def when creating the pairlist and getting the ohlcv. --- freqtrade/plugins/pairlistmanager.py | 8 +++++++- freqtrade/strategy/interface.py | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/freqtrade/plugins/pairlistmanager.py b/freqtrade/plugins/pairlistmanager.py index 5ae9a7e35..6a67e7dd5 100644 --- a/freqtrade/plugins/pairlistmanager.py +++ b/freqtrade/plugins/pairlistmanager.py @@ -139,4 +139,10 @@ class PairListManager(): """ Create list of pair tuples with (pair, timeframe) """ - return [(pair, timeframe or self._config['timeframe'], CandleType.SPOT) for pair in pairs] + return [ + ( + pair, + timeframe or self._config['timeframe'], + self._config.get('candle_type_def', CandleType.SPOT) + ) for pair in pairs + ] diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 56d717064..5cd12144a 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -564,7 +564,9 @@ class IStrategy(ABC, HyperStrategyMixin): """ if not self.dp: raise OperationalException("DataProvider not found.") - dataframe = self.dp.ohlcv(pair, self.timeframe) + dataframe = self.dp.ohlcv( + pair, self.timeframe, candle_type=self.config.get('candle_type_def', CandleType.SPOT) + ) if not isinstance(dataframe, DataFrame) or dataframe.empty: logger.warning('Empty candle (OHLCV) data for pair %s', pair) return