diff --git a/tests/conftest.py b/tests/conftest.py index 9c43a5d64..326a25314 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2386,14 +2386,7 @@ def trades_history_df(trades_history): @pytest.fixture(scope="function") def fetch_trades_result(): - return [{'info': {'a': 126181329, - 'p': '0.01962700', - 'q': '0.04000000', - 'f': 138604155, - 'l': 138604155, - 'T': 1565798399463, - 'm': False, - 'M': True}, + return [{'info': ['0.01962700', '0.04000000', '1565798399.4631551', 'b', 'm', '', '126181329'], 'timestamp': 1565798399463, 'datetime': '2019-08-14T15:59:59.463Z', 'symbol': 'ETH/BTC', @@ -2406,14 +2399,7 @@ def fetch_trades_result(): 'amount': 0.04, 'cost': 0.00078508, 'fee': None}, - {'info': {'a': 126181330, - 'p': '0.01962700', - 'q': '0.24400000', - 'f': 138604156, - 'l': 138604156, - 'T': 1565798399629, - 'm': False, - 'M': True}, + {'info': ['0.01962700', '0.24400000', '1565798399.6291551', 'b', 'm', '', '126181330'], 'timestamp': 1565798399629, 'datetime': '2019-08-14T15:59:59.629Z', 'symbol': 'ETH/BTC', @@ -2426,14 +2412,7 @@ def fetch_trades_result(): 'amount': 0.244, 'cost': 0.004788987999999999, 'fee': None}, - {'info': {'a': 126181331, - 'p': '0.01962600', - 'q': '0.01100000', - 'f': 138604157, - 'l': 138604157, - 'T': 1565798399752, - 'm': True, - 'M': True}, + {'info': ['0.01962600', '0.01100000', '1565798399.7521551', 's', 'm', '', '126181331'], 'timestamp': 1565798399752, 'datetime': '2019-08-14T15:59:59.752Z', 'symbol': 'ETH/BTC', @@ -2446,14 +2425,7 @@ def fetch_trades_result(): 'amount': 0.011, 'cost': 0.00021588599999999999, 'fee': None}, - {'info': {'a': 126181332, - 'p': '0.01962600', - 'q': '0.01100000', - 'f': 138604158, - 'l': 138604158, - 'T': 1565798399862, - 'm': True, - 'M': True}, + {'info': ['0.01962600', '0.01100000', '1565798399.8621551', 's', 'm', '', '126181332'], 'timestamp': 1565798399862, 'datetime': '2019-08-14T15:59:59.862Z', 'symbol': 'ETH/BTC', @@ -2466,14 +2438,8 @@ def fetch_trades_result(): 'amount': 0.011, 'cost': 0.00021588599999999999, 'fee': None}, - {'info': {'a': 126181333, - 'p': '0.01952600', - 'q': '0.01200000', - 'f': 138604158, - 'l': 138604158, - 'T': 1565798399872, - 'm': True, - 'M': True}, + {'info': ['0.01952600', '0.01200000', '1565798399.8721551', 's', 'm', '', '126181333', + 1565798399872512133], 'timestamp': 1565798399872, 'datetime': '2019-08-14T15:59:59.872Z', 'symbol': 'ETH/BTC', diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index cdfdee95f..d652ed58e 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -2849,7 +2849,10 @@ async def test__async_fetch_trades(default_conf, mocker, caplog, exchange_name, assert isinstance(res[0], list) assert isinstance(res[1], list) if exchange._trades_pagination == 'id': - assert pagid == '126181333' + if exchange_name == 'kraken': + assert pagid == 1565798399872512133 + else: + assert pagid == '126181333' else: assert pagid == 1565798399872 @@ -2867,7 +2870,10 @@ async def test__async_fetch_trades(default_conf, mocker, caplog, exchange_name, assert exchange._api_async.fetch_trades.call_args[1]['params'] == {'from': '123'} if exchange._trades_pagination == 'id': - assert pagid == '126181333' + if exchange_name == 'kraken': + assert pagid == 1565798399872512133 + else: + assert pagid == '126181333' else: assert pagid == 1565798399872