From 69264cc164747cbb395ecc8fe4d9694c12df38b0 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 12 Oct 2023 07:13:30 +0200 Subject: [PATCH] Reduce funding fee update calls Funding fees update every 4-8 hours - calling this every 15 minutes is way overboard. --- freqtrade/freqtradebot.py | 2 +- tests/test_freqtradebot.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 56f0c3d7e..a9bf80456 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -132,7 +132,7 @@ class FreqtradeBot(LoggingMixin): # TODO: This would be more efficient if scheduled in utc time, and performed at each # TODO: funding interval, specified by funding_fee_times on the exchange classes for time_slot in range(0, 24): - for minutes in [0, 15, 30, 45]: + for minutes in [0, 30]: t = str(time(time_slot, minutes, 2)) self._schedule.every().day.at(t).do(update) self.last_process: Optional[datetime] = None diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 790e29179..0e61e169f 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -5917,16 +5917,16 @@ def test_get_valid_price(mocker, default_conf_usdt) -> None: @pytest.mark.parametrize('trading_mode,calls,t1,t2', [ ('spot', 0, "2021-09-01 00:00:00", "2021-09-01 08:00:00"), ('margin', 0, "2021-09-01 00:00:00", "2021-09-01 08:00:00"), - ('futures', 31, "2021-09-01 00:00:02", "2021-09-01 08:00:01"), - ('futures', 32, "2021-08-31 23:59:59", "2021-09-01 08:00:01"), - ('futures', 32, "2021-09-01 00:00:02", "2021-09-01 08:00:02"), - ('futures', 33, "2021-08-31 23:59:59", "2021-09-01 08:00:02"), - ('futures', 33, "2021-08-31 23:59:59", "2021-09-01 08:00:03"), - ('futures', 33, "2021-08-31 23:59:59", "2021-09-01 08:00:04"), - ('futures', 33, "2021-08-31 23:59:59", "2021-09-01 08:00:05"), - ('futures', 33, "2021-08-31 23:59:59", "2021-09-01 08:00:06"), - ('futures', 33, "2021-08-31 23:59:59", "2021-09-01 08:00:07"), - ('futures', 33, "2021-08-31 23:59:58", "2021-09-01 08:00:07"), + ('futures', 15, "2021-09-01 00:00:02", "2021-09-01 08:00:01"), + ('futures', 16, "2021-08-31 23:59:59", "2021-09-01 08:00:01"), + ('futures', 16, "2021-09-01 00:00:02", "2021-09-01 08:00:02"), + ('futures', 17, "2021-08-31 23:59:59", "2021-09-01 08:00:02"), + ('futures', 17, "2021-08-31 23:59:59", "2021-09-01 08:00:03"), + ('futures', 17, "2021-08-31 23:59:59", "2021-09-01 08:00:04"), + ('futures', 17, "2021-08-31 23:59:59", "2021-09-01 08:00:05"), + ('futures', 17, "2021-08-31 23:59:59", "2021-09-01 08:00:06"), + ('futures', 17, "2021-08-31 23:59:59", "2021-09-01 08:00:07"), + ('futures', 17, "2021-08-31 23:59:58", "2021-09-01 08:00:07"), ]) def test_update_funding_fees_schedule(mocker, default_conf, trading_mode, calls, time_machine, t1, t2):