From 8dc278f1a0ed288bd2ffa5fc65dbbe2a779e2fc5 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 10 May 2025 13:30:26 +0200 Subject: [PATCH] refactor: simplify ws exchange handling --- freqtrade/exchange/exchange.py | 10 +++------- tests/exchange_online/conftest.py | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index de6bfec80..dc5a4bad2 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -267,11 +267,11 @@ class Exchange: exchange_conf.get("ccxt_async_config", {}), ccxt_async_config ) self._api_async = self._init_ccxt(exchange_conf, False, ccxt_async_config) - self._has_watch_ohlcv = self.exchange_has("watchOHLCV") and self._ft_has["ws_enabled"] + _has_watch_ohlcv = self.exchange_has("watchOHLCV") and self._ft_has["ws_enabled"] if ( self._config["runmode"] in TRADE_MODES and exchange_conf.get("enable_ws", True) - and self._has_watch_ohlcv + and _has_watch_ohlcv ): self._ws_async = self._init_ccxt(exchange_conf, False, ccxt_async_config) self._exchange_ws = ExchangeWS(self._config, self._ws_async) @@ -2449,11 +2449,7 @@ class Exchange: Check if we can use websocket for this pair. Acts as typeguard for exchangeWs """ - if ( - self._has_watch_ohlcv - and exchange_ws - and candle_type in (CandleType.SPOT, CandleType.FUTURES) - ): + if exchange_ws and candle_type in (CandleType.SPOT, CandleType.FUTURES): return True return False diff --git a/tests/exchange_online/conftest.py b/tests/exchange_online/conftest.py index f7cf49aa4..4b650db8c 100644 --- a/tests/exchange_online/conftest.py +++ b/tests/exchange_online/conftest.py @@ -599,7 +599,7 @@ def exchange_ws(request, exchange_conf, exchange_mode, class_mocker): else: pytest.skip("Exchange does not support futures.") - if not exchange._has_watch_ohlcv: + if not exchange._exchange_ws: pytest.skip("Exchange does not support watch_ohlcv.") yield exchange, name, pair exchange.close()