From dda5a59019bac0405b4dc607ba63a72df69b4a07 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 22 Sep 2023 18:20:52 +0200 Subject: [PATCH] Revert "Bump ccxt to 4.0.101" --- requirements.txt | 2 +- tests/exchange_online/conftest.py | 12 ++++++------ tests/exchange_online/test_ccxt_compat.py | 6 ++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6c7839c74..304233bd9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ numpy==1.25.2; platform_machine == 'armv7l' pandas==2.0.3 pandas-ta==0.3.14b -ccxt==4.0.101 +ccxt==4.0.88 cryptography==41.0.3 aiohttp==3.8.5 SQLAlchemy==2.0.20 diff --git a/tests/exchange_online/conftest.py b/tests/exchange_online/conftest.py index c5f59ee0e..45da16dd5 100644 --- a/tests/exchange_online/conftest.py +++ b/tests/exchange_online/conftest.py @@ -234,12 +234,12 @@ EXCHANGES = { "orderId": "1274754916287346280", "orderLinkId": "1666798627015730", "symbol": "SOLUSDT", - "createdTime": "1674493798550", - "price": "15.5", - "qty": "1.1", - "orderType": "Limit", - "side": "Buy", - "orderStatus": "New", + "createTime": "1674493798550", + "orderPrice": "15.5", + "orderQty": "1.1", + "orderType": "LIMIT", + "side": "BUY", + "status": "NEW", "timeInForce": "GTC", "accountId": "5555555", "execQty": "0", diff --git a/tests/exchange_online/test_ccxt_compat.py b/tests/exchange_online/test_ccxt_compat.py index aa3dfdfae..e33875416 100644 --- a/tests/exchange_online/test_ccxt_compat.py +++ b/tests/exchange_online/test_ccxt_compat.py @@ -58,10 +58,8 @@ class TestCCXTExchange: def test_ccxt_order_parse(self, exchange: EXCHANGE_FIXTURE_TYPE): exch, exchange_name = exchange if orders := EXCHANGES[exchange_name].get('sample_order'): - pair = 'SOL/USDT' for order in orders: - market = exch._api.markets[pair] - po = exch._api.parse_order(order, market) + po = exch._api.parse_order(order) assert isinstance(po['id'], str) assert po['id'] is not None if len(order.keys()) < 5: @@ -76,7 +74,7 @@ class TestCCXTExchange: if po['average'] is not None: assert isinstance(po['average'], float) assert po['average'] == 15.5 - assert po['symbol'] == pair + assert po['symbol'] == 'SOL/USDT' assert isinstance(po['amount'], float) assert po['amount'] == 1.1 assert isinstance(po['status'], str)