[pull] develop from freqtrade:develop

freqtrade/exchange/common.py

@@ -111,11 +111,14 @@ def _get_logging_mixin():
 }
 
 
-def calculate_backoff(retrycount, max_retries):
+def calculate_backoff(remaining_retries, max_retries):
     """
     Calculate backoff
+    :param remaining_retries: Number of retries left - counts down with each attempt,
+                              so the delay increases with each retry.
+    :param max_retries: Maximum number of retries
     """
-    return (max_retries - retrycount) ** 2 + 1
+    return (max_retries - remaining_retries) ** 2 + 1
 
 
 def retrier_async(f):

freqtrade/plugins/pairlist/PercentChangePairList.py

@@ -276,7 +276,6 @@ def fetch_candles_for_lookback_period(
         needed_pairs: ListPairsWithTimeframes = [
             (p, self._lookback_timeframe, self._def_candletype)
             for p in [s["symbol"] for s in filtered_tickers]
-            if p not in self._pair_cache
         ]
         candles = self._exchange.refresh_ohlcv_with_cache(needed_pairs, since_ms)
         return candles

freqtrade/plugins/pairlist/VolumePairList.py

@@ -256,7 +256,6 @@ def filter_pairlist(self, pairlist: list[str], tickers: dict) -> list[str]:
             needed_pairs: ListPairsWithTimeframes = [
                 (p, self._lookback_timeframe, self._def_candletype)
                 for p in [s["symbol"] for s in filtered_tickers]
-                if p not in self._pair_cache
             ]
 
             candles = self._exchange.refresh_ohlcv_with_cache(needed_pairs, since_ms)

tests/exchange/test_exchange.py

@@ -5226,7 +5226,7 @@ def test_calculate_fee_rate(mocker, default_conf, order, expected, unknown_fee_r
 
 
 @pytest.mark.parametrize(
-    "retrycount,max_retries,expected",
+    "remaining_retries,max_retries,expected",
     [
         (0, 3, 10),
         (1, 3, 5),
@@ -5247,8 +5247,8 @@ def test_calculate_fee_rate(mocker, default_conf, order, expected, unknown_fee_r
         (5, 5, 1),
     ],
 )
-def test_calculate_backoff(retrycount, max_retries, expected):
-    assert calculate_backoff(retrycount, max_retries) == expected
+def test_calculate_backoff(remaining_retries, max_retries, expected):
+    assert calculate_backoff(remaining_retries, max_retries) == expected
 
 
 @pytest.mark.parametrize("exchange_name", EXCHANGES)