diff --git a/freqtrade/data/history/datahandlers/idatahandler.py b/freqtrade/data/history/datahandlers/idatahandler.py index 9e7d9de3a..59904e39f 100644 --- a/freqtrade/data/history/datahandlers/idatahandler.py +++ b/freqtrade/data/history/datahandlers/idatahandler.py @@ -70,28 +70,6 @@ class IDataHandler(ABC): if match and len(match.groups()) > 1 ] - @classmethod - def ohlcv_get_pairs(cls, datadir: Path, timeframe: str, candle_type: CandleType) -> list[str]: - """ - Returns a list of all pairs with ohlcv data available in this datadir - for the specified timeframe - :param datadir: Directory to search for ohlcv files - :param timeframe: Timeframe to search pairs for - :param candle_type: Any of the enum CandleType (must match trading mode!) - :return: List of Pairs - """ - candle = "" - if candle_type != CandleType.SPOT: - datadir = datadir.joinpath("futures") - candle = f"-{candle_type}" - ext = cls._get_file_extension() - _tmp = [ - re.search(r"^(\S+)(?=\-" + timeframe + candle + f".{ext})", p.name) - for p in datadir.glob(f"*{timeframe}{candle}.{ext}") - ] - # Check if regex found something and only return these results - return [cls.rebuild_pair_from_filename(match[0]) for match in _tmp if match] - @abstractmethod def ohlcv_store( self, pair: str, timeframe: str, data: DataFrame, candle_type: CandleType diff --git a/tests/data/test_datahandler.py b/tests/data/test_datahandler.py index 9bab3e797..fdbffac87 100644 --- a/tests/data/test_datahandler.py +++ b/tests/data/test_datahandler.py @@ -24,36 +24,6 @@ from freqtrade.exceptions import OperationalException from tests.conftest import log_has, log_has_re -def test_datahandler_ohlcv_get_pairs(testdatadir): - pairs = FeatherDataHandler.ohlcv_get_pairs(testdatadir, "5m", candle_type=CandleType.SPOT) - # Convert to set to avoid failures due to sorting - assert set(pairs) == { - "UNITTEST/BTC", - "XLM/BTC", - "ETH/BTC", - "TRX/BTC", - "LTC/BTC", - "XMR/BTC", - "ZEC/BTC", - "ADA/BTC", - "ETC/BTC", - "NXT/BTC", - "DASH/BTC", - "XRP/ETH", - "BTC/USDT", - "XRP/USDT", - } - - pairs = JsonGzDataHandler.ohlcv_get_pairs(testdatadir, "8m", candle_type=CandleType.SPOT) - assert set(pairs) == {"UNITTEST/BTC"} - - pairs = FeatherDataHandler.ohlcv_get_pairs(testdatadir, "1h", candle_type=CandleType.MARK) - assert set(pairs) == {"UNITTEST/USDT:USDT", "XRP/USDT:USDT"} - - pairs = JsonGzDataHandler.ohlcv_get_pairs(testdatadir, "1h", candle_type=CandleType.FUTURES) - assert set(pairs) == {"XRP/USDT:USDT"} - - @pytest.mark.parametrize( "filename,pair,timeframe,candletype", [