Skip to content

Commit 609ac56

Browse files
authored
Merge pull request freqtrade#12434 from freqtrade/dependabot/pip/develop/ccxt-4.5.12
chore(deps): bump ccxt from 4.5.11 to 4.5.12
2 parents dc736da + 5ae0328 commit 609ac56

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

freqtrade/exchange/okx.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RetryableOrderError,
1212
TemporaryError,
1313
)
14-
from freqtrade.exchange import Exchange, date_minus_candles
14+
from freqtrade.exchange import Exchange
1515
from freqtrade.exchange.common import API_RETRY_COUNT, retrier
1616
from freqtrade.exchange.exchange_types import CcxtOrder, FtHas
1717
from freqtrade.misc import safe_value_fallback2
@@ -80,11 +80,6 @@ def ohlcv_candle_limit(
8080
if candle_type in (CandleType.FUTURES, CandleType.SPOT):
8181
return 300
8282

83-
if candle_type in (CandleType.MARK, CandleType.PREMIUMINDEX) and (
84-
not since_ms or since_ms > (date_minus_candles(timeframe, 300).timestamp() * 1000)
85-
):
86-
return 300
87-
8883
return super().ohlcv_candle_limit(timeframe, candle_type, since_ms)
8984

9085
@retrier

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ft-pandas-ta==0.3.16
77
ta-lib==0.6.8
88
technical==1.5.3
99

10-
ccxt==4.5.11
10+
ccxt==4.5.12
1111
cryptography==46.0.3
1212
aiohttp==3.13.1
1313
SQLAlchemy==2.0.44

tests/exchange/test_exchange.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,10 +2176,7 @@ async def mock_candle_hist(pair, timeframe, candle_type, since_ms):
21762176
since = date_minus_candles("5m", candle_limit)
21772177
ret = exchange.get_historic_ohlcv(pair, "5m", dt_ts(since), candle_type=candle_type)
21782178

2179-
if exchange_name == "okx" and candle_type == "mark":
2180-
expected = 4
2181-
else:
2182-
expected = 2
2179+
expected = 2
21832180
assert exchange._async_get_candle_history.call_count == expected
21842181
# Returns twice the above OHLCV data after truncating the open candle.
21852182
assert len(ret) == expected

tests/exchange/test_okx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_okx_ohlcv_candle_limit(default_conf, mocker):
2020
for timeframe in timeframes:
2121
assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT) == 300
2222
assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUTURES) == 300
23-
assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK) == 300
23+
assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK) == 100
2424
assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUNDING_RATE) == 100
2525

2626
assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT, start_time) == 300
@@ -36,7 +36,7 @@ def test_okx_ohlcv_candle_limit(default_conf, mocker):
3636

3737
assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT, one_call) == 300
3838
assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUTURES, one_call) == 300
39-
assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK, one_call) == 300
39+
assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK, one_call) == 100
4040

4141
one_call = int(
4242
(

0 commit comments

Comments
 (0)