From c98e7ea0558f1093b4ebdeecb8755ff3f60b58fc Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Jul 2022 08:57:15 +0200 Subject: [PATCH] Revert allowing empty currency for futures --- freqtrade/exchange/exchange.py | 6 +++--- tests/exchange/test_exchange.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index fdf323582..cd13964c4 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -1616,7 +1616,8 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def order_has_fee(self, order: Dict) -> bool: + @staticmethod + def order_has_fee(order: Dict) -> bool: """ Verifies if the passed in order dict has the needed keys to extract fees, and that these keys (currency, cost) are not empty. @@ -1627,8 +1628,7 @@ class Exchange: return False return ('fee' in order and order['fee'] is not None and (order['fee'].keys() >= {'currency', 'cost'}) - and (order['fee']['currency'] is not None - or self.trading_mode == TradingMode.FUTURES) + and order['fee']['currency'] is not None and order['fee']['cost'] is not None ) diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index 6fce0bb8f..acd48b3fd 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -3529,10 +3529,8 @@ def test_market_is_active(market, expected_result) -> None: ({'fee': {'currency': 'ETH/BTC', 'cost': None}}, False), ({'fee': {'currency': 'ETH/BTC', 'cost': 0.01}}, True), ]) -def test_order_has_fee(mocker, default_conf, order, expected) -> None: - ex = get_patched_exchange(mocker, default_conf) - - assert ex.order_has_fee(order) == expected +def test_order_has_fee(order, expected) -> None: + assert Exchange.order_has_fee(order) == expected @pytest.mark.parametrize("order,expected", [