adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Several fixes

Browse Source 
Code optimizations
This commit is contained in:
Ron Klinkien 2022-03-31 08:30:20 +02:00
parent 6c811b3de1
commit 3d8cfa7ea5
2 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
freqtrade/rpc/telegram.py
View File

@ -914,25 +914,21 @@ class Telegram(RPCHandler):
trade_id = context.args[0] trade_id = context.args[0]
self._forcesell_action(trade_id) self._forcesell_action(trade_id)
else: else:
try: fiat_currency = self._config.get('fiat_display_currency', '')
fiat_currency = self._config.get('fiat_display_currency', '') statlist, head, fiat_profit_sum = self._rpc._rpc_status_table(
statlist, head, fiat_profit_sum = self._rpc._rpc_status_table( self._config['stake_currency'], fiat_currency)
self._config['stake_currency'], fiat_currency)
trades = [] trades = []
for trade in statlist: for trade in statlist:
trades.append(f"{trade[0]} {trade[1]} {trade[2]} {trade[3]}") trades.append(f"{trade[0]} {trade[1]} {trade[2]} {trade[3]}")
trade_buttons = [ trade_buttons = [
InlineKeyboardButton(text=trade, callback_data=trade) for trade in trades] InlineKeyboardButton(text=trade, callback_data=trade) for trade in trades]
buttons_aligned = self._layout_inline_keyboard_onecol(trade_buttons) buttons_aligned = self._layout_inline_keyboard_onecol(trade_buttons)
buttons_aligned.append([InlineKeyboardButton(text='Cancel', callback_data='cancel')]) buttons_aligned.append([InlineKeyboardButton(text='Cancel', callback_data='cancel')])
self._send_msg(msg="Which trade?", self._send_msg(msg="Which trade?",
keyboard=buttons_aligned) keyboard=buttons_aligned)
except RPCException as e:
self._send_msg(str(e))
def _forcesell_action(self, trade_id): def _forcesell_action(self, trade_id):
if trade_id != 'cancel': if trade_id != 'cancel':

27
tests/rpc/test_rpc_telegram.py
View File

@ -1199,33 +1199,6 @@ def test_forcesell_handle_invalid(default_conf, update, mocker) -> None:
assert 'invalid argument' in msg_mock.call_args_list[0][0][0] assert 'invalid argument' in msg_mock.call_args_list[0][0][0]
def test_forcesell_no_tradeid(default_conf, update, mocker) -> None:
fsell_mock = MagicMock(return_value=None)
mocker.patch('freqtrade.rpc.RPC._rpc_forcesell', fsell_mock)
telegram, freqtradebot, msg_mock = get_telegram_testobject(mocker, default_conf)
patch_get_signal(freqtradebot)
context = MagicMock()
context.args = []
telegram._forcesell(update=update, context=context)
assert fsell_mock.call_count == 0
assert msg_mock.call_count == 1
assert msg_mock.call_args_list[0][1]['msg'] == 'Which trade?'
# assert msg_mock.call_args_list[0][1]['callback_query_handler'] == 'forcesell'
keyboard = msg_mock.call_args_list[0][1]['keyboard']
# One additional button - cancel
assert reduce(lambda acc, x: acc + len(x), keyboard, 0) == 5
update = MagicMock()
update.callback_query = MagicMock()
update.callback_query.data = '1 XRP/USDT 1h 2.20% (1.20)'
telegram._forcesell_inline(update, None)
assert fsell_mock.call_count == 1
def test_forcebuy_handle(default_conf, update, mocker) -> None: def test_forcebuy_handle(default_conf, update, mocker) -> None:
mocker.patch('freqtrade.rpc.rpc.CryptoToFiatConverter._find_price', return_value=15000.0) mocker.patch('freqtrade.rpc.rpc.CryptoToFiatConverter._find_price', return_value=15000.0)