From a4fc7ce0c455ded03f0bc5bcfcddb07ec3213b36 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 3 Sep 2023 17:05:57 +0200
Subject: [PATCH] "fix" bybit invalid order responses for canceled orders

closes #9128
---
 freqtrade/exchange/bybit.py  | 11 ++++++++
 tests/exchange/test_bybit.py | 52 ++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/freqtrade/exchange/bybit.py b/freqtrade/exchange/bybit.py
index 6dda70a80..41e667fb5 100644
--- a/freqtrade/exchange/bybit.py
+++ b/freqtrade/exchange/bybit.py
@@ -221,3 +221,14 @@ class Bybit(Exchange):
             since = until
 
         return orders
+
+    def fetch_order(self, order_id: str, pair: str, params: Dict = {}) -> Dict:
+        order = super().fetch_order(order_id, pair, params)
+        if (
+            order.get('status') == 'canceled'
+            and order.get('filled') == 0.0
+            and order.get('remaining') == 0.0
+        ):
+            # Canceled orders will have "remaining=0" on bybit.
+            order['remaining'] = None
+        return order
diff --git a/tests/exchange/test_bybit.py b/tests/exchange/test_bybit.py
index 6d8877e20..f7383934b 100644
--- a/tests/exchange/test_bybit.py
+++ b/tests/exchange/test_bybit.py
@@ -96,3 +96,55 @@ def test_bybit_fetch_orders(default_conf, mocker, limit_order):
     assert api_mock.fetch_open_orders.call_count == 0
     assert api_mock.fetch_closed_orders.call_count == 0
     assert len(res) == 2 * 3
+
+
+def test_bybit_fetch_order_canceled_empty(default_conf_usdt, mocker):
+    default_conf_usdt['dry_run'] = False
+
+    api_mock = MagicMock()
+    api_mock.fetch_order = MagicMock(return_value={
+        'id': '123',
+        'symbol': 'BTC/USDT',
+        'status': 'canceled',
+        'filled': 0.0,
+        'remaining': 0.0,
+        'amount': 20.0,
+    })
+
+    exchange = get_patched_exchange(mocker, default_conf_usdt, api_mock, id='bybit')
+
+    res = exchange.fetch_order('123', 'BTC/USDT')
+    assert res['remaining'] is None
+    assert res['filled'] == 0.0
+    assert res['amount'] == 20.0
+    assert res['status'] == 'canceled'
+
+    api_mock.fetch_order = MagicMock(return_value={
+        'id': '123',
+        'symbol': 'BTC/USDT',
+        'status': 'canceled',
+        'filled': 0.0,
+        'remaining': 20.0,
+        'amount': 20.0,
+    })
+    # Don't touch orders which return correctly.
+    res1 = exchange.fetch_order('123', 'BTC/USDT')
+    assert res1['remaining'] == 20.0
+    assert res1['filled'] == 0.0
+    assert res1['amount'] == 20.0
+    assert res1['status'] == 'canceled'
+
+    # Reverse test - remaining is not touched
+    api_mock.fetch_order = MagicMock(return_value={
+        'id': '124',
+        'symbol': 'BTC/USDT',
+        'status': 'open',
+        'filled': 0.0,
+        'remaining': 20.0,
+        'amount': 20.0,
+    })
+    res2 = exchange.fetch_order('123', 'BTC/USDT')
+    assert res2['remaining'] == 20.0
+    assert res2['filled'] == 0.0
+    assert res2['amount'] == 20.0
+    assert res2['status'] == 'open'