New funding fee methods

tests/leverage/test_leverage.py

@@ -3,7 +3,7 @@ from math import isclose
 
 import pytest
 
-from freqtrade.leverage.interest import interest
+from freqtrade.leverage import interest
 
 
 ten_mins = Decimal(1/6)

tests/rpc/test_rpc.py

@@ -8,7 +8,7 @@ import pytest
 from numpy import isnan
 
 from freqtrade.edge import PairInfo
-from freqtrade.enums import State
+from freqtrade.enums import State, TradingMode
 from freqtrade.exceptions import ExchangeError, InvalidOrderException, TemporaryError
 from freqtrade.persistence import Trade
 from freqtrade.persistence.pairlock_middleware import PairLocks
@@ -112,6 +112,8 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'interest_rate': 0.0,
         'isolated_liq': None,
         'is_short': False,
+        'funding_fees': None,
+        'trading_mode': TradingMode.SPOT
     }
 
     mocker.patch('freqtrade.exchange.Exchange.get_rate',
@@ -183,6 +185,8 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'interest_rate': 0.0,
         'isolated_liq': None,
         'is_short': False,
+        'funding_fees': None,
+        'trading_mode': TradingMode.SPOT
     }
 
 

tests/test_persistence.py

@@ -1724,8 +1724,7 @@ def test_to_json(default_conf, fee):
                       'isolated_liq': None,
                       'is_short': None,
                       'trading_mode': None,
-                      'funding_fee': None,
-                      'last_funding_adjustment': None
+                      'funding_fees': None,
                       }
 
     # Simulate dry_run entries
@@ -1798,8 +1797,7 @@ def test_to_json(default_conf, fee):
                       'isolated_liq': None,
                       'is_short': None,
                       'trading_mode': None,
-                      'funding_fee': None,
-                      'last_funding_adjustment': None
+                      'funding_fees': None,
                       }
 
 
@@ -2219,7 +2217,6 @@ def test_Trade_object_idem():
         'get_open_trades_without_assigned_fees',
         'get_open_order_trades',
         'get_trades',
-        'last_funding_adjustment'
     )
 
     # Parent (LocalTrade) should have the same attributes