From d3713cf245cb5dcd668ae51efe81bbaadc824e14 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 18 Jan 2022 07:40:09 +0100 Subject: [PATCH] Fix fee test --- tests/exchange/test_ccxt_compat.py | 3 ++- tests/test_freqtradebot.py | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/exchange/test_ccxt_compat.py b/tests/exchange/test_ccxt_compat.py index 37551b3c5..a799bc302 100644 --- a/tests/exchange/test_ccxt_compat.py +++ b/tests/exchange/test_ccxt_compat.py @@ -280,7 +280,8 @@ class TestCCXTExchange(): pair = EXCHANGES[exchangename].get('futures_pair', EXCHANGES[exchangename]['pair']) since = datetime.now(timezone.utc) - timedelta(days=5) - funding_fee = exchange._fetch_and_calculate_funding_fees(pair, 20, open_date=since) + funding_fee = exchange._fetch_and_calculate_funding_fees( + pair, 20, is_short=False, open_date=since) assert isinstance(funding_fee, float) # assert funding_fee > 0 diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 9dcae292b..f036c3538 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -4901,17 +4901,17 @@ def test_update_funding_fees( freqtrade = get_patched_freqtradebot(mocker, default_conf) # initial funding fees, - freqtrade.execute_entry('ETH/BTC', 123) - freqtrade.execute_entry('LTC/BTC', 2.0) - freqtrade.execute_entry('XRP/BTC', 123) - + freqtrade.execute_entry('ETH/BTC', 123, is_short=is_short) + freqtrade.execute_entry('LTC/BTC', 2.0, is_short=is_short) + freqtrade.execute_entry('XRP/BTC', 123, is_short=is_short) + multipl = 1 if is_short else -1 trades = Trade.get_open_trades() assert len(trades) == 3 for trade in trades: assert pytest.approx(trade.funding_fees) == ( trade.amount * mark_prices[trade.pair].iloc[0]['open'] * - funding_rates[trade.pair].iloc[0]['open'] + funding_rates[trade.pair].iloc[0]['open'] * multipl ) mocker.patch('freqtrade.exchange.Exchange.create_order', return_value=open_exit_order) time_machine.move_to("2021-09-01 08:00:00 +00:00") @@ -4926,7 +4926,7 @@ def test_update_funding_fees( assert trade.funding_fees == pytest.approx(sum( trade.amount * mark_prices[trade.pair].iloc[0:2]['open'] * - funding_rates[trade.pair].iloc[0:2]['open'] + funding_rates[trade.pair].iloc[0:2]['open'] * multipl )) else: @@ -4936,7 +4936,9 @@ def test_update_funding_fees( for trade in trades: assert trade.funding_fees == pytest.approx(sum( trade.amount * - mark_prices[trade.pair].iloc[0:2]['open'] * funding_rates[trade.pair].iloc[0:2]['open'] + mark_prices[trade.pair].iloc[0:2]['open'] * + funding_rates[trade.pair].iloc[0:2]['open'] * + multipl ))