Persist pairlocks

closes #3034

tests/strategy/test_interface.py

@@ -1,5 +1,4 @@
 # pragma pylint: disable=missing-docstring, C0103
-
 import logging
 from datetime import datetime, timedelta, timezone
 from unittest.mock import MagicMock
@@ -12,7 +11,7 @@ from freqtrade.configuration import TimeRange
 from freqtrade.data.dataprovider import DataProvider
 from freqtrade.data.history import load_data
 from freqtrade.exceptions import StrategyError
-from freqtrade.persistence import Trade
+from freqtrade.persistence import PairLock, Trade
 from freqtrade.resolvers import StrategyResolver
 from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper
 from tests.conftest import log_has, log_has_re
@@ -360,11 +359,12 @@ def test__analyze_ticker_internal_skip_analyze(ohlcv_history, mocker, caplog) ->
     assert log_has('Skipping TA Analysis for already analyzed candle', caplog)
 
 
+@pytest.mark.usefixtures("init_persistence")
 def test_is_pair_locked(default_conf):
     default_conf.update({'strategy': 'DefaultStrategy'})
     strategy = StrategyResolver.load_strategy(default_conf)
-    # dict should be empty
-    assert not strategy._pair_locked_until
+    # No lock should be present
+    assert len(PairLock.query.all()) == 0
 
     pair = 'ETH/BTC'
     assert not strategy.is_pair_locked(pair)
@@ -372,11 +372,6 @@ def test_is_pair_locked(default_conf):
     # ETH/BTC locked for 4 minutes
     assert strategy.is_pair_locked(pair)
 
-    # Test lock does not change
-    lock = strategy._pair_locked_until[pair]
-    strategy.lock_pair(pair, arrow.utcnow().shift(minutes=2).datetime)
-    assert lock == strategy._pair_locked_until[pair]
-
     # XRP/BTC should not be locked now
     pair = 'XRP/BTC'
     assert not strategy.is_pair_locked(pair)
@@ -393,7 +388,10 @@ def test_is_pair_locked(default_conf):
     # Lock until 14:30
     lock_time = datetime(2020, 5, 1, 14, 30, 0, tzinfo=timezone.utc)
     strategy.lock_pair(pair, lock_time)
-    # Lock is in the past ...
+    # Lock is in the past, so we must fake the lock
+    lock = PairLock.query.filter(PairLock.pair == pair).first()
+    lock.lock_time = lock_time - timedelta(hours=2)
+
     assert not strategy.is_pair_locked(pair)
     # latest candle is from 14:20, lock goes to 14:30
     assert strategy.is_pair_locked(pair, lock_time + timedelta(minutes=-10))

tests/test_freqtradebot.py

@@ -15,7 +15,7 @@ from freqtrade.exceptions import (DependencyException, ExchangeError, Insufficie
                                   InvalidOrderException, OperationalException, PricingError,
                                   TemporaryError)
 from freqtrade.freqtradebot import FreqtradeBot
-from freqtrade.persistence import Order, Trade
+from freqtrade.persistence import Order, PairLock, Trade
 from freqtrade.rpc import RPCMessageType
 from freqtrade.state import RunMode, State
 from freqtrade.strategy.interface import SellCheckTuple, SellType
@@ -2799,6 +2799,7 @@ def test_execute_sell_sloe_cancel_exception(mocker, default_conf, ticker, fee, c
 
     trade = Trade.query.first()
     Trade.session = MagicMock()
+    PairLock.session = MagicMock()
 
     freqtrade.config['dry_run'] = False
     trade.stoploss_order_id = "abcd"
@@ -3249,7 +3250,6 @@ def test_locked_pairs(default_conf, ticker, fee, ticker_sell_down, mocker, caplo
     freqtrade.execute_sell(trade=trade, limit=ticker_sell_down()['bid'],
                            sell_reason=SellType.STOP_LOSS)
     trade.close(ticker_sell_down()['bid'])
-    assert trade.pair in freqtrade.strategy._pair_locked_until
     assert freqtrade.strategy.is_pair_locked(trade.pair)
 
     # reinit - should buy other pair.