diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 34857c71e..53b5644b3 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -30,7 +30,6 @@ from freqtrade.enums import ( from freqtrade.exceptions import OperationalException, StrategyError from freqtrade.exchange import timeframe_to_minutes, timeframe_to_next_date, timeframe_to_seconds from freqtrade.ft_types import AnnotationType -from freqtrade.misc import remove_entry_exit_signals from freqtrade.persistence import Order, PairLocks, Trade from freqtrade.strategy.hyper import HyperStrategyMixin from freqtrade.strategy.informative_decorator import ( @@ -1224,7 +1223,6 @@ class IStrategy(ABC, HyperStrategyMixin): else: logger.debug("Skipping TA Analysis for already analyzed candle") - dataframe = remove_entry_exit_signals(dataframe) logger.debug("Loop Analysis Launched") diff --git a/tests/strategy/test_interface.py b/tests/strategy/test_interface.py index 5eb933f44..e6a8e0a91 100644 --- a/tests/strategy/test_interface.py +++ b/tests/strategy/test_interface.py @@ -846,11 +846,9 @@ def test__analyze_ticker_internal_skip_analyze(ohlcv_history, mocker, caplog) -> assert ind_mock.call_count == 1 assert entry_mock.call_count == 1 assert entry_mock.call_count == 1 - # only skipped analyze adds buy and sell columns, otherwise it's all mocked - assert "enter_long" in ret.columns - assert "exit_long" in ret.columns - assert ret["enter_long"].sum() == 0 - assert ret["exit_long"].sum() == 0 + # skipped analysis does NOT add buy and sell columns + assert "enter_long" not in ret.columns + assert "exit_long" not in ret.columns assert not log_has("TA Analysis Launched", caplog) assert log_has("Skipping TA Analysis for already analyzed candle", caplog)