diff --git a/freqtrade/exchange/binance.py b/freqtrade/exchange/binance.py index 6d818bab9..b21e64eb2 100644 --- a/freqtrade/exchange/binance.py +++ b/freqtrade/exchange/binance.py @@ -42,24 +42,6 @@ class Binance(Exchange): (TradingMode.FUTURES, MarginMode.ISOLATED) ] - def stoploss_adjust(self, stop_loss: float, order: Dict, side: str) -> bool: - """ - Verify stop_loss against stoploss-order value (limit or price) - Returns True if adjustment is necessary. - :param side: "buy" or "sell" - """ - order_types = ('stop_loss_limit', 'stop', 'stop_market') - - return ( - order.get('stopPrice', None) is None - or ( - order['type'] in order_types - and ( - (side == "sell" and stop_loss > float(order['stopPrice'])) or - (side == "buy" and stop_loss < float(order['stopPrice'])) - ) - )) - def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Tickers: tickers = super().get_tickers(symbols=symbols, cached=cached) if self.trading_mode == TradingMode.FUTURES: diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index ca53e5333..cdbe1804e 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -1076,7 +1076,11 @@ class Exchange: Verify stop_loss against stoploss-order value (limit or price) Returns True if adjustment is necessary. """ - raise OperationalException(f"stoploss is not implemented for {self.name}.") + if not self._ft_has.get('stoploss_on_exchange'): + raise OperationalException(f"stoploss is not implemented for {self.name}.") + + return ((side == "sell" and stop_loss > float(order['stopPrice'])) or + (side == "buy" and stop_loss < float(order['stopPrice']))) def _get_stop_order_type(self, user_order_type) -> Tuple[str, str]: diff --git a/freqtrade/exchange/gateio.py b/freqtrade/exchange/gateio.py index ab127a036..de178af02 100644 --- a/freqtrade/exchange/gateio.py +++ b/freqtrade/exchange/gateio.py @@ -126,13 +126,3 @@ class Gateio(Exchange): pair=pair, params={'stop': True} ) - - def stoploss_adjust(self, stop_loss: float, order: Dict, side: str) -> bool: - """ - Verify stop_loss against stoploss-order value (limit or price) - Returns True if adjustment is necessary. - """ - return (order.get('stopPrice', None) is None or ( - side == "sell" and stop_loss > float(order['stopPrice'])) or - (side == "buy" and stop_loss < float(order['stopPrice'])) - ) diff --git a/tests/exchange/test_binance.py b/tests/exchange/test_binance.py index 75aaa0081..1fc8b4153 100644 --- a/tests/exchange/test_binance.py +++ b/tests/exchange/test_binance.py @@ -162,9 +162,6 @@ def test_stoploss_adjust_binance(mocker, default_conf, sl1, sl2, sl3, side): } assert exchange.stoploss_adjust(sl1, order, side=side) assert not exchange.stoploss_adjust(sl2, order, side=side) - # Test with invalid order case - order['type'] = 'stop_loss' - assert not exchange.stoploss_adjust(sl3, order, side=side) def test_fill_leverage_tiers_binance(default_conf, mocker):