From 523d8a84a810535588452d49c8f4489c3066ef66 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 11 Jul 2022 10:22:51 +0200 Subject: [PATCH] skip "supports market order" for now until CCXT fixes their assignemnt bugs. --- freqtrade/exchange/common.py | 2 +- freqtrade/exchange/exchange.py | 11 +++++++---- tests/exchange/test_exchange.py | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/freqtrade/exchange/common.py b/freqtrade/exchange/common.py index e5b6533c4..0046ba458 100644 --- a/freqtrade/exchange/common.py +++ b/freqtrade/exchange/common.py @@ -64,7 +64,6 @@ EXCHANGE_HAS_REQUIRED = [ 'fetchOrder', 'cancelOrder', 'createOrder', - # 'createLimitOrder', 'createMarketOrder', 'fetchBalance', # Public endpoints @@ -74,6 +73,7 @@ EXCHANGE_HAS_REQUIRED = [ EXCHANGE_HAS_OPTIONAL = [ # Private 'fetchMyTrades', # Trades for order - fee detection + # 'createLimitOrder', 'createMarketOrder', # Either OR for orders # 'setLeverage', # Margin/Futures trading # 'setMarginMode', # Margin/Futures trading # 'fetchFundingHistory', # Futures trading diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index cd13964c4..58d5ebb07 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -586,10 +586,13 @@ class Exchange: """ Checks if order-types configured in strategy/config are supported """ - if any(v == 'market' for k, v in order_types.items()): - if not self.exchange_has('createMarketOrder'): - raise OperationalException( - f'Exchange {self.name} does not support market orders.') + # TODO: Reenable once ccxt fixes createMarketOrder assignment - as well as + # Revert the change in test_validate_ordertypes. + + # if any(v == 'market' for k, v in order_types.items()): + # if not self.exchange_has('createMarketOrder'): + # raise OperationalException( + # f'Exchange {self.name} does not support market orders.') if (order_types.get("stoploss_on_exchange") and not self._ft_has.get("stoploss_on_exchange", False)): diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index acd48b3fd..69969e527 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -1027,9 +1027,9 @@ def test_validate_ordertypes(default_conf, mocker): 'stoploss': 'market', 'stoploss_on_exchange': False } - with pytest.raises(OperationalException, - match=r'Exchange .* does not support market orders.'): - Exchange(default_conf) + # with pytest.raises(OperationalException, + # match=r'Exchange .* does not support market orders.'): + # Exchange(default_conf) default_conf['order_types'] = { 'entry': 'limit',