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

Fix rpc forceexit logic, fix remaining test

Browse Source
This commit is contained in:
Matthias
2023-08-27 10:29:34 +02:00
parent 2f97b00d31
commit f19f3ed4eb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/rpc/rpc.py
+1 -1
View File
@@ -786,7 +786,7 @@ class RPC:
self._freqtrade.handle_cancel_exit( self._freqtrade.handle_cancel_exit(
trade, order, oo.order_id, CANCEL_REASON['FORCE_EXIT']) trade, order, oo.order_id, CANCEL_REASON['FORCE_EXIT'])
if all(tocr['cancel_state'] for tocr in trade_entry_cancelation_registry): if all(tocr['cancel_state'] is False for tocr in trade_entry_cancelation_registry):
if trade.has_open_orders: if trade.has_open_orders:
# Order cancellation failed, so we can't exit. # Order cancellation failed, so we can't exit.
return False return False
tests/rpc/test_rpc.py
+4 -4
View File
@@ -778,7 +778,7 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
'amount': amount, 'amount': amount,
'remaining': amount, 'remaining': amount,
'filled': 0.0, 'filled': 0.0,
'id': trade.orders[0].order_id, 'id': trade.orders[-1].order_id,
} }
) )
cancel_order_3 = mocker.patch( cancel_order_3 = mocker.patch(
@@ -790,7 +790,7 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
'amount': amount, 'amount': amount,
'remaining': amount, 'remaining': amount,
'filled': 0.0, 'filled': 0.0,
'id': trade.orders[0].order_id, 'id': trade.orders[-1].order_id,
} }
) )
msg = rpc._rpc_force_exit('3') msg = rpc._rpc_force_exit('3')
@@ -799,7 +799,7 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
assert cancel_order_3.call_count == 1 assert cancel_order_3.call_count == 1
assert cancel_order_mock.call_count == 0 assert cancel_order_mock.call_count == 0
trade = Trade.session.scalars(select(Trade).filter(Trade.id == '2')).first() trade = Trade.session.scalars(select(Trade).filter(Trade.id == '4')).first()
amount = trade.amount amount = trade.amount
# make an limit-buy open trade, if there is no 'filled', don't sell it # make an limit-buy open trade, if there is no 'filled', don't sell it
mocker.patch( mocker.patch(
@@ -828,7 +828,7 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
assert msg == {'result': 'Created exit order for trade 4.'} assert msg == {'result': 'Created exit order for trade 4.'}
assert cancel_order_4.call_count == 1 assert cancel_order_4.call_count == 1
assert cancel_order_mock.call_count == 0 assert cancel_order_mock.call_count == 0
assert trade.amount == amount assert pytest.approx(trade.amount) == amount
def test_performance_handle(default_conf_usdt, ticker, fee, mocker) -> None: def test_performance_handle(default_conf_usdt, ticker, fee, mocker) -> None: