Skip to content

Commit 66020d2

Browse files
committed
test: update test trades pagination handling to use _ft_has
1 parent 909286c commit 66020d2

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tests/exchange/test_binance.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,10 +1015,10 @@ async def mock_get_trade_hist(pair, *args, **kwargs):
10151015
# Don't expect to get here
10161016
raise ValueError("Unexpected call")
10171017
# return fetch_trades_result[:-2]
1018-
elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) == "0":
1018+
elif kwargs.get("params", {}).get(exchange._ft_has["trades_pagination_arg"]) == "0":
10191019
# Return first 3
10201020
return fetch_trades_result[:-2]
1021-
elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) in (
1021+
elif kwargs.get("params", {}).get(exchange._ft_has["trades_pagination_arg"]) in (
10221022
fetch_trades_result[-3]["id"],
10231023
1565798399752,
10241024
):
@@ -1076,10 +1076,10 @@ async def mock_get_trade_hist(pair, *args, **kwargs):
10761076
# # Don't expect to get here
10771077
# raise ValueError("Unexpected call")
10781078
# # return fetch_trades_result[:-2]
1079-
elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) == "0":
1079+
elif kwargs.get("params", {}).get(exchange._ft_has["trades_pagination_arg"]) == "0":
10801080
# Return first 3
10811081
return fetch_trades_result[:-2]
1082-
# elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) in (
1082+
# elif kwargs.get("params", {}).get(exchange._ft_has['trades_pagination_arg']) in (
10831083
# fetch_trades_result[-3]["id"],
10841084
# 1565798399752,
10851085
# ):

tests/exchange/test_exchange.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3269,7 +3269,7 @@ async def test__async_fetch_trades(
32693269
assert isinstance(res, list)
32703270
assert isinstance(res[0], list)
32713271
assert isinstance(res[1], list)
3272-
if exchange._trades_pagination == "id":
3272+
if exchange._ft_has["trades_pagination"] == "id":
32733273
if exchange_name == "kraken":
32743274
assert pagid == 1565798399872512133
32753275
else:
@@ -3290,7 +3290,7 @@ async def test__async_fetch_trades(
32903290
assert exchange._api_async.fetch_trades.call_args[1]["limit"] == 1000
32913291
assert exchange._api_async.fetch_trades.call_args[1]["params"] == {"from": "123"}
32923292

3293-
if exchange._trades_pagination == "id":
3293+
if exchange._ft_has["trades_pagination"] == "id":
32943294
if exchange_name == "kraken":
32953295
assert pagid == 1565798399872512133
32963296
else:
@@ -3379,10 +3379,10 @@ async def test__async_get_trade_history_id(
33793379
):
33803380
default_conf["exchange"]["only_from_ccxt"] = True
33813381
exchange = get_patched_exchange(mocker, default_conf, exchange=exchange_name)
3382-
if exchange._trades_pagination != "id":
3382+
if exchange._ft_has["trades_pagination"] != "id":
33833383
exchange.close()
33843384
pytest.skip("Exchange does not support pagination by trade id")
3385-
pagination_arg = exchange._trades_pagination_arg
3385+
pagination_arg = exchange._ft_has["trades_pagination_arg"]
33863386

33873387
async def mock_get_trade_hist(pair, *args, **kwargs):
33883388
if "since" in kwargs:
@@ -3456,7 +3456,7 @@ async def mock_get_trade_hist(pair, *args, **kwargs):
34563456

34573457
caplog.set_level(logging.DEBUG)
34583458
exchange = get_patched_exchange(mocker, default_conf, exchange=exchange_name)
3459-
if exchange._trades_pagination != "time":
3459+
if exchange._ft_has["trades_pagination"] != "time":
34603460
exchange.close()
34613461
pytest.skip("Exchange does not support pagination by timestamp")
34623462
# Monkey-patch async function

0 commit comments

Comments
 (0)