Merge pull request #6656 from freqtrade/use_sell_signal

Use sell signal -> use_exit_signal

tests/optimize/test_backtest_detail.py

@@ -821,7 +821,7 @@ def test_backtest_results(default_conf, fee, mocker, caplog, data: BTContainer)
     if data.trailing_stop_positive is not None:
         default_conf["trailing_stop_positive"] = data.trailing_stop_positive
     default_conf["trailing_stop_positive_offset"] = data.trailing_stop_positive_offset
-    default_conf["use_sell_signal"] = data.use_exit_signal
+    default_conf["use_exit_signal"] = data.use_exit_signal
 
     mocker.patch("freqtrade.exchange.Exchange.get_fee", return_value=0.0)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)

tests/optimize/test_backtesting.py

@@ -504,7 +504,7 @@ def test_backtesting_pairlist_list(default_conf, mocker, caplog, testdatadir, ti
 
 
 def test_backtest__enter_trade(default_conf, fee, mocker) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))
@@ -563,7 +563,7 @@ def test_backtest__enter_trade(default_conf, fee, mocker) -> None:
 
 
 def test_backtest__enter_trade_futures(default_conf_usdt, fee, mocker) -> None:
-    default_conf_usdt['use_sell_signal'] = False
+    default_conf_usdt['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))
@@ -645,7 +645,7 @@ def test_backtest__enter_trade_futures(default_conf_usdt, fee, mocker) -> None:
 
 
 def test_backtest__get_sell_trade_entry(default_conf, fee, mocker) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))
@@ -740,7 +740,7 @@ def test_backtest__get_sell_trade_entry(default_conf, fee, mocker) -> None:
 
 
 def test_backtest_one(default_conf, fee, mocker, testdatadir) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))
@@ -807,7 +807,7 @@ def test_backtest_one(default_conf, fee, mocker, testdatadir) -> None:
 
 
 def test_backtest_1min_timeframe(default_conf, fee, mocker, testdatadir) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))
@@ -833,7 +833,7 @@ def test_backtest_1min_timeframe(default_conf, fee, mocker, testdatadir) -> None
 
 
 def test_backtest_trim_no_data_left(default_conf, fee, mocker, testdatadir) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))
@@ -878,7 +878,7 @@ def test_processed(default_conf, mocker, testdatadir) -> None:
 
 
 def test_backtest_dataprovider_analyzed_df(default_conf, fee, mocker, testdatadir) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=100000)
@@ -1151,10 +1151,10 @@ def test_backtest_start_timerange(default_conf, mocker, caplog, testdatadir):
 def test_backtest_start_multi_strat(default_conf, mocker, caplog, testdatadir):
 
     default_conf.update({
-        "use_sell_signal": True,
-        "sell_profit_only": False,
-        "sell_profit_offset": 0.0,
-        "ignore_roi_if_buy_signal": False,
+        "use_exit_signal": True,
+        "exit_profit_only": False,
+        "exit_profit_offset": 0.0,
+        "ignore_roi_if_entry_signal": False,
     })
     patch_exchange(mocker)
     backtestmock = MagicMock(return_value={
@@ -1228,10 +1228,10 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog, testdatadir):
 @pytest.mark.filterwarnings("ignore:deprecated")
 def test_backtest_start_multi_strat_nomock(default_conf, mocker, caplog, testdatadir, capsys):
     default_conf.update({
-        "use_sell_signal": True,
-        "sell_profit_only": False,
-        "sell_profit_offset": 0.0,
-        "ignore_roi_if_buy_signal": False,
+        "use_exit_signal": True,
+        "exit_profit_only": False,
+        "exit_profit_offset": 0.0,
+        "ignore_roi_if_entry_signal": False,
     })
     patch_exchange(mocker)
     result1 = pd.DataFrame({'pair': ['XRP/BTC', 'LTC/BTC'],
@@ -1346,10 +1346,10 @@ def test_backtest_start_nomock_futures(default_conf_usdt, mocker,
     default_conf_usdt.update({
         "trading_mode": "futures",
         "margin_mode": "isolated",
-        "use_sell_signal": True,
-        "sell_profit_only": False,
-        "sell_profit_offset": 0.0,
-        "ignore_roi_if_buy_signal": False,
+        "use_exit_signal": True,
+        "exit_profit_only": False,
+        "exit_profit_offset": 0.0,
+        "ignore_roi_if_entry_signal": False,
         "strategy": CURRENT_TEST_STRATEGY,
     })
     patch_exchange(mocker)
@@ -1450,10 +1450,10 @@ def test_backtest_start_multi_strat_nomock_detail(default_conf, mocker,
                                                   caplog, testdatadir, capsys):
     # Tests detail-data loading
     default_conf.update({
-        "use_sell_signal": True,
-        "sell_profit_only": False,
-        "sell_profit_offset": 0.0,
-        "ignore_roi_if_buy_signal": False,
+        "use_exit_signal": True,
+        "exit_profit_only": False,
+        "exit_profit_offset": 0.0,
+        "ignore_roi_if_entry_signal": False,
     })
     patch_exchange(mocker)
     result1 = pd.DataFrame({'pair': ['XRP/BTC', 'LTC/BTC'],
@@ -1557,10 +1557,10 @@ def test_backtest_start_multi_strat_nomock_detail(default_conf, mocker,
 def test_backtest_start_multi_strat_caching(default_conf, mocker, caplog, testdatadir, run_id,
                                             start_delta, cache):
     default_conf.update({
-        "use_sell_signal": True,
-        "sell_profit_only": False,
-        "sell_profit_offset": 0.0,
-        "ignore_roi_if_buy_signal": False,
+        "use_exit_signal": True,
+        "exit_profit_only": False,
+        "exit_profit_offset": 0.0,
+        "ignore_roi_if_entry_signal": False,
     })
     patch_exchange(mocker)
     backtestmock = MagicMock(return_value={

tests/optimize/test_backtesting_adjust_position.py

@@ -14,7 +14,7 @@ from tests.conftest import patch_exchange
 
 
 def test_backtest_position_adjustment(default_conf, fee, mocker, testdatadir) -> None:
-    default_conf['use_sell_signal'] = False
+    default_conf['use_exit_signal'] = False
     mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
     mocker.patch("freqtrade.exchange.Exchange.get_min_pair_stake_amount", return_value=0.00001)
     mocker.patch("freqtrade.exchange.Exchange.get_max_pair_stake_amount", return_value=float('inf'))

tests/strategy/strats/strategy_test_v2.py

@@ -50,6 +50,8 @@ class StrategyTestV2(IStrategy):
         'entry': 'gtc',
         'exit': 'gtc',
     }
+    # Test legacy use_sell_signal definition
+    use_sell_signal = False
 
     # By default this strategy does not use Position Adjustments
     position_adjustment_enable = False

tests/strategy/test_strategy_loading.py

@@ -143,16 +143,6 @@ def test_strategy_can_short(caplog, default_conf):
     assert isinstance(strat, IStrategy)
 
 
-def test_strategy_implements_populate_entry(caplog, default_conf):
-    caplog.set_level(logging.INFO)
-    default_conf.update({
-        'strategy': "StrategyTestV2",
-    })
-    default_conf['trading_mode'] = 'futures'
-    with pytest.raises(OperationalException, match="`populate_entry_trend` must be implemented."):
-        StrategyResolver.load_strategy(default_conf)
-
-
 def test_strategy_override_minimal_roi(caplog, default_conf):
     caplog.set_level(logging.INFO)
     default_conf.update({
@@ -310,50 +300,50 @@ def test_strategy_override_order_tif(caplog, default_conf):
         StrategyResolver.load_strategy(default_conf)
 
 
-def test_strategy_override_use_sell_signal(caplog, default_conf):
+def test_strategy_override_use_exit_signal(caplog, default_conf):
     caplog.set_level(logging.INFO)
     default_conf.update({
         'strategy': CURRENT_TEST_STRATEGY,
     })
     strategy = StrategyResolver.load_strategy(default_conf)
-    assert strategy.use_sell_signal
-    assert isinstance(strategy.use_sell_signal, bool)
+    assert strategy.use_exit_signal
+    assert isinstance(strategy.use_exit_signal, bool)
     # must be inserted to configuration
-    assert 'use_sell_signal' in default_conf
-    assert default_conf['use_sell_signal']
+    assert 'use_exit_signal' in default_conf
+    assert default_conf['use_exit_signal']
 
     default_conf.update({
         'strategy': CURRENT_TEST_STRATEGY,
-        'use_sell_signal': False,
+        'use_exit_signal': False,
     })
     strategy = StrategyResolver.load_strategy(default_conf)
 
-    assert not strategy.use_sell_signal
-    assert isinstance(strategy.use_sell_signal, bool)
-    assert log_has("Override strategy 'use_sell_signal' with value in config file: False.", caplog)
+    assert not strategy.use_exit_signal
+    assert isinstance(strategy.use_exit_signal, bool)
+    assert log_has("Override strategy 'use_exit_signal' with value in config file: False.", caplog)
 
 
-def test_strategy_override_use_sell_profit_only(caplog, default_conf):
+def test_strategy_override_use_exit_profit_only(caplog, default_conf):
     caplog.set_level(logging.INFO)
     default_conf.update({
         'strategy': CURRENT_TEST_STRATEGY,
     })
     strategy = StrategyResolver.load_strategy(default_conf)
-    assert not strategy.sell_profit_only
-    assert isinstance(strategy.sell_profit_only, bool)
+    assert not strategy.exit_profit_only
+    assert isinstance(strategy.exit_profit_only, bool)
     # must be inserted to configuration
-    assert 'sell_profit_only' in default_conf
-    assert not default_conf['sell_profit_only']
+    assert 'exit_profit_only' in default_conf
+    assert not default_conf['exit_profit_only']
 
     default_conf.update({
         'strategy': CURRENT_TEST_STRATEGY,
-        'sell_profit_only': True,
+        'exit_profit_only': True,
     })
     strategy = StrategyResolver.load_strategy(default_conf)
 
-    assert strategy.sell_profit_only
-    assert isinstance(strategy.sell_profit_only, bool)
-    assert log_has("Override strategy 'sell_profit_only' with value in config file: True.", caplog)
+    assert strategy.exit_profit_only
+    assert isinstance(strategy.exit_profit_only, bool)
+    assert log_has("Override strategy 'exit_profit_only' with value in config file: True.", caplog)
 
 
 @pytest.mark.filterwarnings("ignore:deprecated")
@@ -391,7 +381,22 @@ def test_deprecate_populate_indicators(result, default_conf):
 
 
 @pytest.mark.filterwarnings("ignore:deprecated")
-def test_missing_implements(default_conf):
+def test_missing_implements(default_conf, caplog):
+
+    default_location = Path(__file__).parent / "strats"
+    default_conf.update({'strategy': 'StrategyTestV2',
+                         'strategy_path': default_location})
+    StrategyResolver.load_strategy(default_conf)
+
+    log_has_re(r"DEPRECATED: .*use_sell_signal.*use_exit_signal.", caplog)
+
+    default_conf['trading_mode'] = 'futures'
+    with pytest.raises(OperationalException,
+                       match=r"DEPRECATED: .*use_sell_signal.*use_exit_signal."):
+        StrategyResolver.load_strategy(default_conf)
+
+    default_conf['trading_mode'] = 'spot'
+
     default_location = Path(__file__).parent / "strats/broken_strats"
     default_conf.update({'strategy': 'TestStrategyNoImplements',
                          'strategy_path': default_location})

tests/test_configuration.py

@@ -868,15 +868,15 @@ def test_validate_tsl(default_conf):
 
 def test_validate_edge2(edge_conf):
     edge_conf.update({
-        "use_sell_signal": True,
+        "use_exit_signal": True,
     })
     # Passes test
     validate_config_consistency(edge_conf)
 
     edge_conf.update({
-        "use_sell_signal": False,
+        "use_exit_signal": False,
     })
-    with pytest.raises(OperationalException, match="Edge requires `use_sell_signal` to be True, "
+    with pytest.raises(OperationalException, match="Edge requires `use_exit_signal` to be True, "
                        "otherwise no sells will happen."):
         validate_config_consistency(edge_conf)
 
@@ -1238,14 +1238,8 @@ def test_pairlist_resolving_fallback(mocker):
 
 
 @pytest.mark.parametrize("setting", [
-    ("ask_strategy", "use_sell_signal", True,
-     None, "use_sell_signal", False),
-    ("ask_strategy", "sell_profit_only", True,
-     None, "sell_profit_only", False),
-    ("ask_strategy", "sell_profit_offset", 0.1,
-     None, "sell_profit_offset", 0.01),
-    ("ask_strategy", "ignore_roi_if_buy_signal", True,
-     None, "ignore_roi_if_buy_signal", False),
+    ("webhook", "webhookbuy", 'testWEbhook',
+     "webhook", "webhookentry", 'testWEbhook'),
     ("ask_strategy", "ignore_buying_expired_candle_after", 5,
      None, "ignore_buying_expired_candle_after", 6),
 ])

tests/test_freqtradebot.py

@@ -2273,14 +2273,14 @@ def test_handle_trade_roi(default_conf_usdt, ticker_usdt, limit_order_open, fee,
 
 
 @pytest.mark.parametrize("is_short", [False, True])
-def test_handle_trade_use_sell_signal(
+def test_handle_trade_use_exit_signal(
     default_conf_usdt, ticker_usdt, limit_order_open, fee, mocker, caplog, is_short
 ) -> None:
 
     enter_open_order = limit_order_open[exit_side(is_short)]
     exit_open_order = limit_order_open[entry_side(is_short)]
 
-    # use_sell_signal is True buy default
+    # use_exit_signal is True buy default
     caplog.set_level(logging.DEBUG)
     patch_RPCManager(mocker)
     mocker.patch.multiple(
@@ -3637,7 +3637,7 @@ def test_execute_trade_exit_insufficient_funds_error(default_conf_usdt, ticker_u
     (False, 0.10, 0.22, True, False, ExitType.EXIT_SIGNAL.value, False),
     (False, 0.10, 0.22, True, False, ExitType.EXIT_SIGNAL.value, True),
 ])
-def test_sell_profit_only(
+def test_exit_profit_only(
         default_conf_usdt, limit_order, limit_order_open, is_short,
         fee, mocker, profit_only, bid, ask, handle_first, handle_second, exit_type) -> None:
     patch_RPCManager(mocker)
@@ -3657,9 +3657,9 @@ def test_sell_profit_only(
         get_fee=fee,
     )
     default_conf_usdt.update({
-        'use_sell_signal': True,
-        'sell_profit_only': profit_only,
-        'sell_profit_offset': 0.1,
+        'use_exit_signal': True,
+        'exit_profit_only': profit_only,
+        'exit_profit_offset': 0.1,
     })
     freqtrade = FreqtradeBot(default_conf_usdt)
     patch_get_signal(freqtrade, enter_short=is_short, enter_long=not is_short)
@@ -3679,7 +3679,7 @@ def test_sell_profit_only(
     assert freqtrade.handle_trade(trade) is handle_first
 
     if handle_second:
-        freqtrade.strategy.sell_profit_offset = 0.0
+        freqtrade.strategy.exit_profit_offset = 0.0
         assert freqtrade.handle_trade(trade) is True
 
 
@@ -3799,8 +3799,8 @@ def test_locked_pairs(default_conf_usdt, ticker_usdt, fee,
 
 
 @pytest.mark.parametrize("is_short", [False, True])
-def test_ignore_roi_if_buy_signal(default_conf_usdt, limit_order, limit_order_open, is_short,
-                                  fee, mocker) -> None:
+def test_ignore_roi_if_entry_signal(default_conf_usdt, limit_order, limit_order_open, is_short,
+                                    fee, mocker) -> None:
     patch_RPCManager(mocker)
     patch_exchange(mocker)
     eside = entry_side(is_short)
@@ -3817,7 +3817,7 @@ def test_ignore_roi_if_buy_signal(default_conf_usdt, limit_order, limit_order_op
         ]),
         get_fee=fee,
     )
-    default_conf_usdt['ignore_roi_if_buy_signal'] = True
+    default_conf_usdt['ignore_roi_if_entry_signal'] = True
 
     freqtrade = FreqtradeBot(default_conf_usdt)
     patch_get_signal(freqtrade, enter_short=is_short, enter_long=not is_short)
@@ -4016,8 +4016,8 @@ def test_trailing_stop_loss_positive(
 
 
 @pytest.mark.parametrize("is_short", [False, True])
-def test_disable_ignore_roi_if_buy_signal(default_conf_usdt, limit_order, limit_order_open,
-                                          is_short, fee, mocker) -> None:
+def test_disable_ignore_roi_if_entry_signal(default_conf_usdt, limit_order, limit_order_open,
+                                            is_short, fee, mocker) -> None:
     patch_RPCManager(mocker)
     patch_exchange(mocker)
     eside = entry_side(is_short)
@@ -4037,7 +4037,7 @@ def test_disable_ignore_roi_if_buy_signal(default_conf_usdt, limit_order, limit_
         _is_dry_limit_order_filled=MagicMock(return_value=False),
     )
     default_conf_usdt['exit_pricing'] = {
-        'ignore_roi_if_buy_signal': False
+        'ignore_roi_if_entry_signal': False
     }
     freqtrade = FreqtradeBot(default_conf_usdt)
     patch_get_signal(freqtrade, enter_short=is_short, enter_long=not is_short)