mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename get_canceled exit orders ...

Browse Source
This commit is contained in:
Matthias
2023-09-16 09:11:31 +02:00
parent 8378a0234d
commit ae4021da14
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/freqtradebot.py
+1 -1
View File
@@ -1362,7 +1362,7 @@ class FreqtradeBot(LoggingMixin):
self.handle_cancel_enter(trade, order, order_id, reason) self.handle_cancel_enter(trade, order, order_id, reason)
else: else:
canceled = self.handle_cancel_exit(trade, order, order_id, reason) 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) max_timeouts = self.config.get('unfilledtimeout', {}).get('exit_timeout_count', 0)
if canceled and max_timeouts > 0 and canceled_count >= max_timeouts: if canceled and max_timeouts > 0 and canceled_count >= max_timeouts:
logger.warning(f'Emergency exiting trade {trade}, as the exit order ' logger.warning(f'Emergency exiting trade {trade}, as the exit order '
freqtrade/persistence/trade_model.py
+1 -1
View File
@@ -823,7 +823,7 @@ class LocalTrade:
def update_order(self, order: Dict) -> None: def update_order(self, order: Dict) -> None:
Order.update_orders(self.orders, order) 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 Get amount of failed exiting orders
assumes full exits. assumes full exits.
tests/persistence/test_persistence.py
+2 -2
View File
@@ -1928,11 +1928,11 @@ def test_get_best_pair_lev(fee):
@pytest.mark.usefixtures("init_persistence") @pytest.mark.usefixtures("init_persistence")
@pytest.mark.parametrize('is_short', [True, False]) @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) create_mock_trades(fee, is_short=is_short)
trade = Trade.get_trades([Trade.pair == 'ETC/BTC']).first() 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") @pytest.mark.usefixtures("init_persistence")
tests/test_freqtradebot.py
+1 -1
View File
@@ -3052,7 +3052,7 @@ def test_manage_open_orders_exit_usercustom(
# 2nd canceled trade - Fail execute exit # 2nd canceled trade - Fail execute exit
caplog.clear() 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', mocker.patch('freqtrade.freqtradebot.FreqtradeBot.execute_trade_exit',
side_effect=DependencyException) side_effect=DependencyException)
freqtrade.manage_open_orders() freqtrade.manage_open_orders()