From bf2d0468f9b960fec00662f37d8f56c137d38749 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 1 Oct 2024 20:48:43 +0200 Subject: [PATCH] tests: fix test-data setup for btc test trades --- tests/conftest_trades.py | 4 ++-- tests/rpc/test_rpc_apiserver.py | 4 ++-- tests/test_wallets.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/conftest_trades.py b/tests/conftest_trades.py index 7103b5169..f493a9302 100644 --- a/tests/conftest_trades.py +++ b/tests/conftest_trades.py @@ -38,7 +38,7 @@ def mock_trade_1(fee, is_short: bool): trade = Trade( pair="ETH/BTC", stake_amount=0.001, - amount=123.0, + amount=50.0, amount_requested=123.0, fee_open=fee.return_value, fee_close=fee.return_value, @@ -201,7 +201,7 @@ def mock_trade_4(fee, is_short: bool): trade = Trade( pair="ETC/BTC", stake_amount=0.001, - amount=123.0, + amount=0.0, amount_requested=124.0, fee_open=fee.return_value, fee_close=fee.return_value, diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index 4f5ef7860..c6b4bb994 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -1269,7 +1269,7 @@ def test_api_mix_tag(botclient, fee): @pytest.mark.parametrize( "is_short,current_rate,open_trade_value", - [(True, 1.098e-05, 15.0911775), (False, 1.099e-05, 15.1668225)], + [(True, 1.098e-05, 6.134625), (False, 1.099e-05, 6.165375)], ) def test_api_status( botclient, mocker, ticker, fee, markets, is_short, current_rate, open_trade_value @@ -1294,7 +1294,7 @@ def test_api_status( assert_response(rc) assert len(rc.json()) == 4 assert rc.json()[0] == { - "amount": 123.0, + "amount": 50.0, "amount_requested": 123.0, "close_date": None, "close_timestamp": None, diff --git a/tests/test_wallets.py b/tests/test_wallets.py index 2190180bd..545793151 100644 --- a/tests/test_wallets.py +++ b/tests/test_wallets.py @@ -411,11 +411,11 @@ def test_sync_wallet_futures_dry(mocker, default_conf, fee): def test_check_exit_amount(mocker, default_conf, fee): freqtrade = get_patched_freqtradebot(mocker, default_conf) update_mock = mocker.patch("freqtrade.wallets.Wallets.update") - total_mock = mocker.patch("freqtrade.wallets.Wallets.get_total", return_value=123) + total_mock = mocker.patch("freqtrade.wallets.Wallets.get_total", return_value=50.0) create_mock_trades(fee, is_short=None) trade = Trade.session.scalars(select(Trade)).first() - assert trade.amount == 123 + assert trade.amount == 50.0 assert freqtrade.wallets.check_exit_amount(trade) is True assert update_mock.call_count == 0 @@ -424,7 +424,7 @@ def test_check_exit_amount(mocker, default_conf, fee): update_mock.reset_mock() # Reduce returned amount to below the trade amount - which should # trigger a wallet update and return False, triggering "order refinding" - total_mock = mocker.patch("freqtrade.wallets.Wallets.get_total", return_value=100) + total_mock = mocker.patch("freqtrade.wallets.Wallets.get_total", return_value=40) assert freqtrade.wallets.check_exit_amount(trade) is False assert update_mock.call_count == 1 assert total_mock.call_count == 2 @@ -434,12 +434,12 @@ def test_check_exit_amount_futures(mocker, default_conf, fee): default_conf["trading_mode"] = "futures" default_conf["margin_mode"] = "isolated" freqtrade = get_patched_freqtradebot(mocker, default_conf) - total_mock = mocker.patch("freqtrade.wallets.Wallets.get_total", return_value=123) + total_mock = mocker.patch("freqtrade.wallets.Wallets.get_total", return_value=50) create_mock_trades(fee, is_short=None) trade = Trade.session.scalars(select(Trade)).first() trade.trading_mode = "futures" - assert trade.amount == 123 + assert trade.amount == 50 assert freqtrade.wallets.check_exit_amount(trade) is True assert total_mock.call_count == 0