update unfilledtimeout settings to entry/exit

tests/conftest.py

@@ -416,8 +416,8 @@ def get_default_conf(testdatadir):
         "dry_run_wallet": 1000,
         "stoploss": -0.10,
         "unfilledtimeout": {
-            "buy": 10,
-            "sell": 30
+            "entry": 10,
+            "exit": 30
         },
         "bid_strategy": {
             "ask_last_balance": 0.0,

tests/test_configuration.py

@@ -963,7 +963,7 @@ def test_validate_time_in_force(default_conf, caplog) -> None:
         validate_config_consistency(conf)
 
 
-def test_validate_order_types(default_conf, caplog) -> None:
+def test__validate_order_types(default_conf, caplog) -> None:
     conf = deepcopy(default_conf)
     conf['order_types'] = {
         'buy': 'limit',
@@ -998,6 +998,31 @@ def test_validate_order_types(default_conf, caplog) -> None:
         validate_config_consistency(conf)
 
 
+def test__validate_unfilledtimeout(default_conf, caplog) -> None:
+    conf = deepcopy(default_conf)
+    conf['unfilledtimeout'] = {
+        'buy': 30,
+        'sell': 35,
+    }
+    validate_config_consistency(conf)
+    assert log_has_re(r"DEPRECATED: Using 'buy' and 'sell' for unfilledtimeout is.*", caplog)
+    assert conf['unfilledtimeout']['entry'] == 30
+    assert conf['unfilledtimeout']['exit'] == 35
+    assert 'buy' not in conf['unfilledtimeout']
+    assert 'sell' not in conf['unfilledtimeout']
+
+    conf = deepcopy(default_conf)
+    conf['unfilledtimeout'] = {
+        'buy': 30,
+        'sell': 35,
+    }
+    conf['trading_mode'] = 'futures'
+    with pytest.raises(
+            OperationalException,
+            match=r"Please migrate your unfilledtimeout settings to use the new wording\."):
+        validate_config_consistency(conf)
+
+
 def test_load_config_test_comments() -> None:
     """
     Load config with comments

tests/test_freqtradebot.py

@@ -2378,8 +2378,8 @@ def test_check_handle_timedout_entry_usercustom(
     old_order = limit_sell_order_old if is_short else limit_buy_order_old
     old_order['id'] = open_trade.open_order_id
 
-    default_conf_usdt["unfilledtimeout"] = {"buy": 30,
-                                            "sell": 1400} if is_short else {"buy": 1400, "sell": 30}
+    default_conf_usdt["unfilledtimeout"] = {"entry": 30,
+                                            "exit": 1400} if is_short else {"entry": 1400, "exit": 30}
 
     rpc_mock = patch_RPCManager(mocker)
     cancel_order_mock = MagicMock(return_value=old_order)
@@ -2543,7 +2543,7 @@ def test_check_handle_timedout_exit_usercustom(
     default_conf_usdt, ticker_usdt, limit_sell_order_old, mocker,
     is_short, open_trade_usdt, caplog
 ) -> None:
-    default_conf_usdt["unfilledtimeout"] = {"buy": 1440, "sell": 1440, "exit_timeout_count": 1}
+    default_conf_usdt["unfilledtimeout"] = {"entry": 1440, "exit": 1440, "exit_timeout_count": 1}
     limit_sell_order_old['id'] = open_trade_usdt.open_order_id
     if is_short:
         limit_sell_order_old['side'] = 'buy'