From b974e8fddf86e1a10f63e05986201d29a16f8299 Mon Sep 17 00:00:00 2001 From: Sourcery AI Date: Thu, 14 May 2020 04:47:11 +0000 Subject: [PATCH] Refactored by Sourcery --- freqtrade/freqtradebot.py | 49 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 73f0873e4..eda73a8c2 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -946,32 +946,31 @@ class FreqtradeBot: :return: Reason for cancel """ # if trade is not partially completed, just cancel the trade - if order['remaining'] == order['amount'] or order.get('filled') == 0.0: - if not self.exchange.check_order_canceled_empty(order): - reason = "cancelled due to timeout" - try: - # if trade is not partially completed, just delete the trade - self.exchange.cancel_order(trade.open_order_id, trade.pair) - except InvalidOrderException: - logger.exception(f"Could not cancel sell order {trade.open_order_id}") - return 'error cancelling order' - logger.info('Sell order %s for %s.', reason, trade) - else: - reason = "cancelled on exchange" - logger.info('Sell order %s for %s.', reason, trade) + if not ( + order['remaining'] == order['amount'] or order.get('filled') == 0.0 + ): + # TODO: figure out how to handle partially complete sell orders + return 'partially filled - keeping order open' + if self.exchange.check_order_canceled_empty(order): + reason = "cancelled on exchange" + else: + reason = "cancelled due to timeout" + try: + # if trade is not partially completed, just delete the trade + self.exchange.cancel_order(trade.open_order_id, trade.pair) + except InvalidOrderException: + logger.exception(f"Could not cancel sell order {trade.open_order_id}") + return 'error cancelling order' + logger.info('Sell order %s for %s.', reason, trade) + trade.close_rate = None + trade.close_rate_requested = None + trade.close_profit = None + trade.close_profit_abs = None + trade.close_date = None + trade.is_open = True + trade.open_order_id = None - trade.close_rate = None - trade.close_rate_requested = None - trade.close_profit = None - trade.close_profit_abs = None - trade.close_date = None - trade.is_open = True - trade.open_order_id = None - - return reason - - # TODO: figure out how to handle partially complete sell orders - return 'partially filled - keeping order open' + return reason def _safe_sell_amount(self, pair: str, amount: float) -> float: """