From ae4021da142a429c90e6324a4f2cd7c1c670caf6 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 16 Sep 2023 09:11:31 +0200 Subject: [PATCH] Rename get_canceled exit orders ... --- freqtrade/freqtradebot.py | 2 +- freqtrade/persistence/trade_model.py | 2 +- tests/persistence/test_persistence.py | 4 ++-- tests/test_freqtradebot.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index c895aa5c9..ae15cdab1 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -1362,7 +1362,7 @@ class FreqtradeBot(LoggingMixin): self.handle_cancel_enter(trade, order, order_id, reason) else: canceled = self.handle_cancel_exit(trade, order, order_id, reason) - canceled_count = trade.get_exit_order_count() + canceled_count = trade.get_canceled_exit_order_count() max_timeouts = self.config.get('unfilledtimeout', {}).get('exit_timeout_count', 0) if canceled and max_timeouts > 0 and canceled_count >= max_timeouts: logger.warning(f'Emergency exiting trade {trade}, as the exit order ' diff --git a/freqtrade/persistence/trade_model.py b/freqtrade/persistence/trade_model.py index 9d727ab75..2d2e4a93e 100644 --- a/freqtrade/persistence/trade_model.py +++ b/freqtrade/persistence/trade_model.py @@ -823,7 +823,7 @@ class LocalTrade: def update_order(self, order: Dict) -> None: Order.update_orders(self.orders, order) - def get_exit_order_count(self) -> int: + def get_canceled_exit_order_count(self) -> int: """ Get amount of failed exiting orders assumes full exits. diff --git a/tests/persistence/test_persistence.py b/tests/persistence/test_persistence.py index ccb71b781..517effbfc 100644 --- a/tests/persistence/test_persistence.py +++ b/tests/persistence/test_persistence.py @@ -1928,11 +1928,11 @@ def test_get_best_pair_lev(fee): @pytest.mark.usefixtures("init_persistence") @pytest.mark.parametrize('is_short', [True, False]) -def test_get_exit_order_count(fee, is_short): +def test_get_canceled_exit_order_count(fee, is_short): create_mock_trades(fee, is_short=is_short) trade = Trade.get_trades([Trade.pair == 'ETC/BTC']).first() - assert trade.get_exit_order_count() == 1 + assert trade.get_canceled_exit_order_count() == 1 @pytest.mark.usefixtures("init_persistence") diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 2f3a9a1cf..24caf2ce1 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -3052,7 +3052,7 @@ def test_manage_open_orders_exit_usercustom( # 2nd canceled trade - Fail execute exit caplog.clear() - mocker.patch('freqtrade.persistence.Trade.get_exit_order_count', return_value=1) + mocker.patch('freqtrade.persistence.Trade.get_canceled_exit_order_count', return_value=1) mocker.patch('freqtrade.freqtradebot.FreqtradeBot.execute_trade_exit', side_effect=DependencyException) freqtrade.manage_open_orders()