mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12863 from ABSllk/fix-pairlock-expiration

Browse Source 
fix: align pairlock backtesting expiration condition with live/dry run
This commit is contained in:
Matthias
2026-02-27 07:02:04 +01:00
committed by GitHub
parent 2e92fccd7b 3a775a5b65
commit f7b11c5166
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/persistence/pairlock_middleware.py
+1 -1
View File
@@ -86,7 +86,7 @@ class PairLocks:
lock lock
for lock in PairLocks.locks for lock in PairLocks.locks
if ( if (
lock.lock_end_time >= now lock.lock_end_time > now
and lock.active is True and lock.active is True
and (pair is None or lock.pair == pair) and (pair is None or lock.pair == pair)
and (side is None or lock.side == "*" or lock.side == side) and (side is None or lock.side == "*" or lock.side == side)
tests/optimize/test_backtesting.py
+8 -8
View File
@@ -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_min_pair_stake_amount", return_value=0.00001)
mocker.patch(f"{EXMS}.get_max_pair_stake_amount", return_value=float("inf")) mocker.patch(f"{EXMS}.get_max_pair_stake_amount", return_value=float("inf"))
tests = [ tests = [
["sine", 9], ["sine", 10],
["raise", 10], ["raise", 11],
["lower", 0], ["lower", 0],
["sine", 9], ["sine", 10],
["raise", 10], ["raise", 11],
] ]
backtesting = Backtesting(default_conf) backtesting = Backtesting(default_conf)
backtesting._set_strategy(backtesting.strategylist[0]) backtesting._set_strategy(backtesting.strategylist[0])
@@ -1380,11 +1380,11 @@ def test_backtest_pricecontours_protections(default_conf, fee, mocker, testdatad
(None, "lower", 0), (None, "lower", 0),
(None, "sine", 35), (None, "sine", 35),
(None, "raise", 19), (None, "raise", 19),
([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 9), ([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 10),
([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 10), ([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 11),
([{"method": "CooldownPeriod", "stop_duration": 3}], "lower", 0), ([{"method": "CooldownPeriod", "stop_duration": 3}], "lower", 0),
([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 9), ([{"method": "CooldownPeriod", "stop_duration": 3}], "sine", 10),
([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 10), ([{"method": "CooldownPeriod", "stop_duration": 3}], "raise", 11),
], ],
) )
def test_backtest_pricecontours( def test_backtest_pricecontours(