From d1d520769ebf60083e4db6bd569acd46a7ac3f3e Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 29 Jan 2022 14:25:33 +0100 Subject: [PATCH] Improve status table for position adjust don't show "/max" if no maximum is set closes #6317 --- freqtrade/rpc/rpc.py | 6 ++++-- tests/rpc/test_rpc.py | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index a45ba8ea5..ed41dbb01 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -252,9 +252,11 @@ class RPC: profit_str ] if self._config.get('position_adjustment_enable', False): - max_buy = self._config['max_entry_position_adjustment'] + 1 + max_buy_str = '' + if self._config.get('max_entry_position_adjustment', -1) > 0: + max_buy_str = f"/{self._config['max_entry_position_adjustment'] + 1}" filled_buys = trade.nr_of_successful_buys - detail_trade.append(f"{filled_buys}/{max_buy}") + detail_trade.append(f"{filled_buys}{max_buy_str}") trades_list.append(detail_trade) profitcol = "Profit" if self._fiat_converter: diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py index 27c509c94..46828b325 100644 --- a/tests/rpc/test_rpc.py +++ b/tests/rpc/test_rpc.py @@ -221,9 +221,13 @@ def test_rpc_status_table(default_conf, ticker, fee, mocker) -> None: assert '-0.06' == f'{fiat_profit_sum:.2f}' rpc._config['position_adjustment_enable'] = True + rpc._config['max_entry_position_adjustment'] = 3 result, headers, fiat_profit_sum = rpc._rpc_status_table(default_conf['stake_currency'], 'USD') assert "# Buys" in headers assert len(result[0]) == 5 + # 4th column should be 1/4 - as 1 order filled (a total of 4 is possible) + # 3 on top of the initial one. + assert result[0][4] == '1/4' mocker.patch('freqtrade.exchange.Exchange.get_rate', MagicMock(side_effect=ExchangeError("Pair 'ETH/BTC' not available")))