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

Improve test accuracy

Browse Source
This commit is contained in:
Matthias 2023-03-05 19:45:04 +01:00
parent 9d285e3dc0
commit cab1b750b3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/rpc/rpc.py
View File

@ -192,7 +192,7 @@ class RPC:
current_profit = trade.close_profit or 0.0 current_profit = trade.close_profit or 0.0
current_profit_abs = trade.close_profit_abs or 0.0 current_profit_abs = trade.close_profit_abs or 0.0
total_profit_abs = trade.realized_profit + current_profit_abs total_profit_abs = trade.realized_profit + current_profit_abs
total_profit_ratio = 0.0 total_profit_ratio: Optional[float] = None
if trade.max_stake_amount: if trade.max_stake_amount:
total_profit_ratio = ( total_profit_ratio = (
(total_profit_abs / trade.max_stake_amount) * trade.leverage (total_profit_abs / trade.max_stake_amount) * trade.leverage

9
tests/rpc/test_rpc.py
View File

@ -50,7 +50,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
'amount': 91.07468123, 'amount': 91.07468123,
'amount_requested': 91.07468124, 'amount_requested': 91.07468124,
'stake_amount': 0.001, 'stake_amount': 0.001,
'max_stake_amount': ANY, 'max_stake_amount': None,
'trade_duration': None, 'trade_duration': None,
'trade_duration_s': None, 'trade_duration_s': None,
'close_profit': None, 'close_profit': None,
@ -79,7 +79,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
'realized_profit_ratio': None, 'realized_profit_ratio': None,
'total_profit_abs': -4.09e-06, 'total_profit_abs': -4.09e-06,
'total_profit_fiat': ANY, 'total_profit_fiat': ANY,
'total_profit_ratio': ANY, 'total_profit_ratio': None,
'exchange': 'binance', 'exchange': 'binance',
'leverage': 1.0, 'leverage': 1.0,
'interest_rate': 0.0, 'interest_rate': 0.0,
@ -169,6 +169,10 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
results = rpc._rpc_trade_status() results = rpc._rpc_trade_status()
response = deepcopy(gen_response) response = deepcopy(gen_response)
response.update({
'max_stake_amount': 0.001,
'total_profit_ratio': pytest.approx(-0.00409),
})
assert results[0] == response assert results[0] == response
mocker.patch(f'{EXMS}.get_rate', mocker.patch(f'{EXMS}.get_rate',
@ -182,6 +186,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
'stoploss_current_dist': ANY, 'stoploss_current_dist': ANY,
'stoploss_current_dist_ratio': ANY, 'stoploss_current_dist_ratio': ANY,
'stoploss_current_dist_pct': ANY, 'stoploss_current_dist_pct': ANY,
'max_stake_amount': 0.001,
'profit_ratio': ANY, 'profit_ratio': ANY,
'profit_pct': ANY, 'profit_pct': ANY,
'profit_abs': ANY, 'profit_abs': ANY,