test: update test trades pagination handling to use _ft_has
This commit is contained in:
@@ -1015,10 +1015,10 @@ async def test__async_get_trade_history_id_binance(default_conf_usdt, mocker, fe
|
|||||||
# Don't expect to get here
|
# Don't expect to get here
|
||||||
raise ValueError("Unexpected call")
|
raise ValueError("Unexpected call")
|
||||||
# return fetch_trades_result[:-2]
|
# return fetch_trades_result[:-2]
|
||||||
elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) == "0":
|
elif kwargs.get("params", {}).get(exchange._ft_has["trades_pagination_arg"]) == "0":
|
||||||
# Return first 3
|
# Return first 3
|
||||||
return fetch_trades_result[:-2]
|
return fetch_trades_result[:-2]
|
||||||
elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) in (
|
elif kwargs.get("params", {}).get(exchange._ft_has["trades_pagination_arg"]) in (
|
||||||
fetch_trades_result[-3]["id"],
|
fetch_trades_result[-3]["id"],
|
||||||
1565798399752,
|
1565798399752,
|
||||||
):
|
):
|
||||||
@@ -1076,10 +1076,10 @@ async def test__async_get_trade_history_id_binance_fast(
|
|||||||
# # Don't expect to get here
|
# # Don't expect to get here
|
||||||
# raise ValueError("Unexpected call")
|
# raise ValueError("Unexpected call")
|
||||||
# # return fetch_trades_result[:-2]
|
# # return fetch_trades_result[:-2]
|
||||||
elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) == "0":
|
elif kwargs.get("params", {}).get(exchange._ft_has["trades_pagination_arg"]) == "0":
|
||||||
# Return first 3
|
# Return first 3
|
||||||
return fetch_trades_result[:-2]
|
return fetch_trades_result[:-2]
|
||||||
# elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) in (
|
# elif kwargs.get("params", {}).get(exchange._ft_has['trades_pagination_arg']) in (
|
||||||
# fetch_trades_result[-3]["id"],
|
# fetch_trades_result[-3]["id"],
|
||||||
# 1565798399752,
|
# 1565798399752,
|
||||||
# ):
|
# ):
|
||||||
|
|||||||
@@ -3269,7 +3269,7 @@ async def test__async_fetch_trades(
|
|||||||
assert isinstance(res, list)
|
assert isinstance(res, list)
|
||||||
assert isinstance(res[0], list)
|
assert isinstance(res[0], list)
|
||||||
assert isinstance(res[1], list)
|
assert isinstance(res[1], list)
|
||||||
if exchange._trades_pagination == "id":
|
if exchange._ft_has["trades_pagination"] == "id":
|
||||||
if exchange_name == "kraken":
|
if exchange_name == "kraken":
|
||||||
assert pagid == 1565798399872512133
|
assert pagid == 1565798399872512133
|
||||||
else:
|
else:
|
||||||
@@ -3290,7 +3290,7 @@ async def test__async_fetch_trades(
|
|||||||
assert exchange._api_async.fetch_trades.call_args[1]["limit"] == 1000
|
assert exchange._api_async.fetch_trades.call_args[1]["limit"] == 1000
|
||||||
assert exchange._api_async.fetch_trades.call_args[1]["params"] == {"from": "123"}
|
assert exchange._api_async.fetch_trades.call_args[1]["params"] == {"from": "123"}
|
||||||
|
|
||||||
if exchange._trades_pagination == "id":
|
if exchange._ft_has["trades_pagination"] == "id":
|
||||||
if exchange_name == "kraken":
|
if exchange_name == "kraken":
|
||||||
assert pagid == 1565798399872512133
|
assert pagid == 1565798399872512133
|
||||||
else:
|
else:
|
||||||
@@ -3379,10 +3379,10 @@ async def test__async_get_trade_history_id(
|
|||||||
):
|
):
|
||||||
default_conf["exchange"]["only_from_ccxt"] = True
|
default_conf["exchange"]["only_from_ccxt"] = True
|
||||||
exchange = get_patched_exchange(mocker, default_conf, exchange=exchange_name)
|
exchange = get_patched_exchange(mocker, default_conf, exchange=exchange_name)
|
||||||
if exchange._trades_pagination != "id":
|
if exchange._ft_has["trades_pagination"] != "id":
|
||||||
exchange.close()
|
exchange.close()
|
||||||
pytest.skip("Exchange does not support pagination by trade id")
|
pytest.skip("Exchange does not support pagination by trade id")
|
||||||
pagination_arg = exchange._trades_pagination_arg
|
pagination_arg = exchange._ft_has["trades_pagination_arg"]
|
||||||
|
|
||||||
async def mock_get_trade_hist(pair, *args, **kwargs):
|
async def mock_get_trade_hist(pair, *args, **kwargs):
|
||||||
if "since" in kwargs:
|
if "since" in kwargs:
|
||||||
@@ -3456,7 +3456,7 @@ async def test__async_get_trade_history_time(
|
|||||||
|
|
||||||
caplog.set_level(logging.DEBUG)
|
caplog.set_level(logging.DEBUG)
|
||||||
exchange = get_patched_exchange(mocker, default_conf, exchange=exchange_name)
|
exchange = get_patched_exchange(mocker, default_conf, exchange=exchange_name)
|
||||||
if exchange._trades_pagination != "time":
|
if exchange._ft_has["trades_pagination"] != "time":
|
||||||
exchange.close()
|
exchange.close()
|
||||||
pytest.skip("Exchange does not support pagination by timestamp")
|
pytest.skip("Exchange does not support pagination by timestamp")
|
||||||
# Monkey-patch async function
|
# Monkey-patch async function
|
||||||
|
|||||||
Reference in New Issue
Block a user