diff --git a/freqtrade/persistence/pairlock_middleware.py b/freqtrade/persistence/pairlock_middleware.py index 02642c463..94544928d 100644 --- a/freqtrade/persistence/pairlock_middleware.py +++ b/freqtrade/persistence/pairlock_middleware.py @@ -86,7 +86,7 @@ class PairLocks: lock for lock in PairLocks.locks if ( - lock.lock_end_time >= now + lock.lock_end_time > now and lock.active is True and (pair is None or lock.pair == pair) and (side is None or lock.side == "*" or lock.side == side) diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py index 270c5b33d..0a8d2fb45 100644 --- a/tests/optimize/test_backtesting.py +++ b/tests/optimize/test_backtesting.py @@ -1346,11 +1346,11 @@ def test_backtest_pricecontours_protections(default_conf, fee, mocker, testdatad mocker.patch(f"{EXMS}.get_min_pair_stake_amount", return_value=0.00001) mocker.patch(f"{EXMS}.get_max_pair_stake_amount", return_value=float("inf")) tests = [ - ["sine", 9], - ["raise", 10], + ["sine", 10], + ["raise", 11], ["lower", 0], - ["sine", 9], - ["raise", 10], + ["sine", 10], + ["raise", 11], ] backtesting = Backtesting(default_conf) backtesting._set_strategy(backtesting.strategylist[0]) @@ -1380,11 +1380,11 @@ def test_backtest_pricecontours_protections(default_conf, fee, mocker, testdatad (None, "lower", 0), (None, "sine", 35), (None, "raise", 19), - ([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 9), - ([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 10), + ([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 10), + ([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 11), ([{"method": "CooldownPeriod", "stop_duration": 3}], "lower", 0), - ([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 9), - ([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 10), + ([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 10), + ([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 11), ], ) def test_backtest_pricecontours(