Update force exit wording

This commit is contained in:
Matthias
2023-05-31 14:31:45 +02:00
parent 193d88c9c8
commit 5311614d54
3 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -802,12 +802,12 @@ class RPC:
with self._freqtrade._exit_lock: with self._freqtrade._exit_lock:
if trade_id == 'all': if trade_id == 'all':
# Execute sell for all open orders # Execute exit for all open orders
for trade in Trade.get_open_trades(): for trade in Trade.get_open_trades():
self.__exec_force_exit(trade, ordertype) self.__exec_force_exit(trade, ordertype)
Trade.commit() Trade.commit()
self._freqtrade.wallets.update() self._freqtrade.wallets.update()
return {'result': 'Created sell orders for all open trades.'} return {'result': 'Created exit orders for all open trades.'}
# Query for trade # Query for trade
trade = Trade.get_trades( trade = Trade.get_trades(
@@ -820,7 +820,7 @@ class RPC:
self.__exec_force_exit(trade, ordertype, amount) self.__exec_force_exit(trade, ordertype, amount)
Trade.commit() Trade.commit()
self._freqtrade.wallets.update() self._freqtrade.wallets.update()
return {'result': f'Created sell order for trade {trade_id}.'} return {'result': f'Created exit order for trade {trade_id}.'}
def _force_entry_validations(self, pair: str, order_side: SignalDirection): def _force_entry_validations(self, pair: str, order_side: SignalDirection):
if not self._freqtrade.config.get('force_entry_enable', False): if not self._freqtrade.config.get('force_entry_enable', False):
+5 -5
View File
@@ -703,15 +703,15 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
rpc._rpc_force_exit(None) rpc._rpc_force_exit(None)
msg = rpc._rpc_force_exit('all') msg = rpc._rpc_force_exit('all')
assert msg == {'result': 'Created sell orders for all open trades.'} assert msg == {'result': 'Created exit orders for all open trades.'}
freqtradebot.enter_positions() freqtradebot.enter_positions()
msg = rpc._rpc_force_exit('all') msg = rpc._rpc_force_exit('all')
assert msg == {'result': 'Created sell orders for all open trades.'} assert msg == {'result': 'Created exit orders for all open trades.'}
freqtradebot.enter_positions() freqtradebot.enter_positions()
msg = rpc._rpc_force_exit('2') msg = rpc._rpc_force_exit('2')
assert msg == {'result': 'Created sell order for trade 2.'} assert msg == {'result': 'Created exit order for trade 2.'}
freqtradebot.state = State.STOPPED freqtradebot.state = State.STOPPED
with pytest.raises(RPCException, match=r'.*trader is not running*'): with pytest.raises(RPCException, match=r'.*trader is not running*'):
@@ -775,7 +775,7 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
) )
# check that the trade is called, which is done by ensuring exchange.cancel_order is called # check that the trade is called, which is done by ensuring exchange.cancel_order is called
msg = rpc._rpc_force_exit('4') msg = rpc._rpc_force_exit('4')
assert msg == {'result': 'Created sell order for trade 4.'} assert msg == {'result': 'Created exit order for trade 4.'}
assert cancel_order_mock.call_count == 2 assert cancel_order_mock.call_count == 2
assert trade.amount == amount assert trade.amount == amount
@@ -795,7 +795,7 @@ def test_rpc_force_exit(default_conf, ticker, fee, mocker) -> None:
} }
) )
msg = rpc._rpc_force_exit('3') msg = rpc._rpc_force_exit('3')
assert msg == {'result': 'Created sell order for trade 3.'} assert msg == {'result': 'Created exit order for trade 3.'}
# status quo, no exchange calls # status quo, no exchange calls
assert cancel_order_mock.call_count == 3 assert cancel_order_mock.call_count == 3
+2 -2
View File
@@ -1333,7 +1333,7 @@ def test_api_forceexit(botclient, mocker, ticker, fee, markets):
rc = client_post(client, f"{BASE_URI}/forceexit", rc = client_post(client, f"{BASE_URI}/forceexit",
data={"tradeid": "5", "ordertype": "market", "amount": 23}) data={"tradeid": "5", "ordertype": "market", "amount": 23})
assert_response(rc) assert_response(rc)
assert rc.json() == {'result': 'Created sell order for trade 5.'} assert rc.json() == {'result': 'Created exit order for trade 5.'}
Trade.rollback() Trade.rollback()
trade = Trade.get_trades([Trade.id == 5]).first() trade = Trade.get_trades([Trade.id == 5]).first()
@@ -1343,7 +1343,7 @@ def test_api_forceexit(botclient, mocker, ticker, fee, markets):
rc = client_post(client, f"{BASE_URI}/forceexit", rc = client_post(client, f"{BASE_URI}/forceexit",
data={"tradeid": "5"}) data={"tradeid": "5"})
assert_response(rc) assert_response(rc)
assert rc.json() == {'result': 'Created sell order for trade 5.'} assert rc.json() == {'result': 'Created exit order for trade 5.'}
Trade.rollback() Trade.rollback()
trade = Trade.get_trades([Trade.id == 5]).first() trade = Trade.get_trades([Trade.id == 5]).first()