From 437b12fab716597a30eecfdbd5e8be367b1b9ca4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 27 Feb 2022 17:15:33 +0100 Subject: [PATCH] Use trade.* props where possible --- freqtrade/freqtradebot.py | 6 +++--- freqtrade/rpc/rpc.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 909fa61ba..9cdf580e3 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -1599,8 +1599,8 @@ class FreqtradeBot(LoggingMixin): Trade.commit() if order['status'] in constants.NON_OPEN_EXCHANGE_STATES: - # If a buy order was closed, force update on stoploss on exchange - if order.get('side', None) == 'buy': + # If a entry order was closed, force update on stoploss on exchange + if order.get('side', None) == trade.enter_side: trade = self.cancel_stoploss_on_exchange(trade) # Updating wallets when order is closed self.wallets.update() @@ -1610,7 +1610,7 @@ class FreqtradeBot(LoggingMixin): self._notify_exit(trade, '', True) self.handle_protections(trade.pair) elif send_msg and not trade.open_order_id: - # Buy fill + # Enter fill self._notify_enter(trade, order, fill=True) return False diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 3bb7e7a6d..98207bfea 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -696,19 +696,18 @@ class RPC: if trade.open_order_id: order = self._freqtrade.exchange.fetch_order(trade.open_order_id, trade.pair) - if order['side'] == 'buy': + if order['side'] == trade.enter_side: fully_canceled = self._freqtrade.handle_cancel_enter( trade, order, CANCEL_REASON['FORCE_SELL']) - if order['side'] == 'sell': + if order['side'] == trade.exit_side: # Cancel order - so it is placed anew with a fresh price. self._freqtrade.handle_cancel_exit(trade, order, CANCEL_REASON['FORCE_SELL']) if not fully_canceled: # Get current rate and execute sell - closing_side = "buy" if trade.is_short else "sell" current_rate = self._freqtrade.exchange.get_rate( - trade.pair, refresh=False, side=closing_side) + trade.pair, refresh=False, side=trade.exit_side) sell_reason = SellCheckTuple(sell_type=SellType.FORCE_SELL) order_type = ordertype or self._freqtrade.strategy.order_types.get( "forcesell", self._freqtrade.strategy.order_types["sell"])