adelorenzo
/
stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude alternative candletypes from timeframe check

This commit is contained in:
Matthias 2022-03-13 16:13:38 +01:00
parent cfa9458bcc
commit d5f0c6c78d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/exchange/exchange.py
View File

@ -1678,7 +1678,8 @@ class Exchange:
cached_pairs = [] cached_pairs = []
# Gather coroutines to run # Gather coroutines to run
for pair, timeframe, candle_type in set(pair_list): for pair, timeframe, candle_type in set(pair_list):
if timeframe not in self.timeframes: if (timeframe not in self.timeframes
and candle_type in (CandleType.SPOT, CandleType.FUTURES)):
logger.warning( logger.warning(
f"Cannot download ({pair}, {timeframe}) combination as this timeframe is " f"Cannot download ({pair}, {timeframe}) combination as this timeframe is "
f"not available on {self.name}. Available timeframes are " f"not available on {self.name}. Available timeframes are "

9
tests/exchange/test_exchange.py
View File

@ -1886,9 +1886,12 @@ def test_refresh_latest_ohlcv(mocker, default_conf, caplog, candle_type) -> None
caplog.clear() caplog.clear()
# Call with invalid timeframe # Call with invalid timeframe
res = exchange.refresh_latest_ohlcv([('IOTA/ETH', '3m', candle_type)], cache=False) res = exchange.refresh_latest_ohlcv([('IOTA/ETH', '3m', candle_type)], cache=False)
assert not res if candle_type != CandleType.MARK:
assert len(res) == 0 assert not res
assert log_has_re(r'Cannot download \(IOTA\/ETH, 3m\).*', caplog) assert len(res) == 0
assert log_has_re(r'Cannot download \(IOTA\/ETH, 3m\).*', caplog)
else:
assert len(res) == 1
@pytest.mark.asyncio @pytest.mark.asyncio