From 976cc1ab15f8d361132974454d02f47a4af5ec23 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 3 May 2023 06:48:17 +0200 Subject: [PATCH] Extract order_obj existence check to separate function --- freqtrade/freqtradebot.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index d8a5c0c29..423b3ec04 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -1722,9 +1722,7 @@ class FreqtradeBot(LoggingMixin): trade.exit_order_status = reason order = trade.select_order_by_order_id(order_id) - if not order: - raise DependencyException( - f"Order_obj not found for {order_id}. This should not have happened.") + self.order_obj_or_raise(order_id, order) profit_rate: float = trade.safe_close_rate profit_trade = trade.calc_profit(rate=profit_rate) @@ -1765,6 +1763,11 @@ class FreqtradeBot(LoggingMixin): # Send the message self.rpc.send_msg(msg) + def order_obj_or_raise(self, order_id: str, order_obj: Order): + if not order_obj: + raise DependencyException( + f"Order_obj not found for {order_id}. This should not have happened.") + # # Common update trade state methods # @@ -1804,9 +1807,7 @@ class FreqtradeBot(LoggingMixin): return True order_obj = trade.select_order_by_order_id(order_id) - if not order_obj: - raise DependencyException( - f"Order_obj not found for {order_id}. This should not have happened.") + self.order_obj_or_raise(order_id, order_obj) self.handle_order_fee(trade, order_obj, order)