[Proxies] handle aiohttp_socks errors

GuillaumeDSM · GuillaumeDSM · commit 9cfb65a420b1 · 2025-02-03T19:04:12.000+01:00
diff --git a/tests/exchanges/test_exchange.py b/tests/exchanges/test_exchange.py
@@ -20,6 +20,7 @@
 import trading_backend.exchanges as exchanges
 import trading_backend.errors
 import trading_backend.enums
+from trading_backend.exchanges.exchange import ProxyConnectionError
 from tests import default_exchange
 
 
@@ -49,6 +50,12 @@ async def test_is_valid_account(default_exchange):
         with pytest.raises(trading_backend.errors.APIKeyPermissionsError):
             assert await exchange.is_valid_account() == (True, None)
         fetch_balance_mock.assert_called_once()
+    with mock.patch.object(exchange._exchange.connector.client, "fetch_balance",
+                           mock.AsyncMock(side_effect=ProxyConnectionError)) as fetch_balance_mock:
+        # non ccxt error: proceed to right checks and raise
+        with pytest.raises(trading_backend.errors.UnexpectedError):
+            assert await exchange.is_valid_account() == (True, None)
+        fetch_balance_mock.assert_called_once()
     with mock.patch.object(exchange._exchange.connector.client, "fetch_balance",
                            mock.AsyncMock(side_effect=ccxt.InvalidNonce)) as fetch_balance_mock:
         with pytest.raises(trading_backend.errors.TimeSyncError):
diff --git a/trading_backend/exchanges/exchange.py b/trading_backend/exchanges/exchange.py
@@ -15,6 +15,12 @@
 #  License along with this library.
 import ccxt
 import contextlib
+try:
+    from aiohttp_socks import ProxyConnectionError
+except ImportError:
+    # local mock in case aiohttp_socks is not available
+    class ProxyConnectionError(Exception):
+        pass
 
 import trading_backend.errors
 import trading_backend.enums
@@ -199,7 +205,7 @@ def error_describer(self):
         """
         try:
             yield
-        except (ccxt.ExchangeNotAvailable, ccxt.AuthenticationError) as err:
+        except (ccxt.ExchangeNotAvailable, ccxt.AuthenticationError, ProxyConnectionError) as err:
             try:
                 self._exchange.connector.raise_or_prefix_proxy_error_if_relevant(err, None)
             except ccxt.BaseError:
