adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify implementation of "check_override" by extracting it to function

Browse Source
This commit is contained in:
Matthias 2022-03-12 10:57:03 +01:00
parent 6946203a7c
commit fe62a71f4c
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
freqtrade/resolvers/strategy_resolver.py
View File

@ -222,18 +222,22 @@ class StrategyResolver(IResolver):
if strategy: if strategy:
if strategy.config.get('trading_mode', TradingMode.SPOT) != TradingMode.SPOT: if strategy.config.get('trading_mode', TradingMode.SPOT) != TradingMode.SPOT:
# Require new method # Require new method
if type(strategy).populate_entry_trend == IStrategy.populate_entry_trend: if check_override(strategy, IStrategy, 'populate_entry_trend'):
raise OperationalException("`populate_entry_trend` must be implemented.") raise OperationalException("`populate_entry_trend` must be implemented.")
if type(strategy).populate_exit_trend == IStrategy.populate_exit_trend: if check_override(strategy, IStrategy, 'populate_exit_trend'):
raise OperationalException("`populate_exit_trend` must be implemented.") raise OperationalException("`populate_exit_trend` must be implemented.")
else: else:
# TODO: Implementing buy_trend and sell_trend should raise a deprecation. # TODO: Implementing buy_trend and sell_trend should show a deprecation warning
if (type(strategy).populate_buy_trend == IStrategy.populate_buy_trend if (
and type(strategy).populate_entry_trend == IStrategy.populate_entry_trend): check_override(strategy, IStrategy, 'populate_buy_trend')
and check_override(strategy, IStrategy, 'populate_entry_trend')
):
raise OperationalException( raise OperationalException(
"`populate_entry_trend` or `populate_buy_trend` must be implemented.") "`populate_entry_trend` or `populate_buy_trend` must be implemented.")
if (type(strategy).populate_sell_trend == IStrategy.populate_sell_trend if (
and type(strategy).populate_exit_trend == IStrategy.populate_exit_trend): check_override(strategy, IStrategy, 'populate_sell_trend')
and check_override(strategy, IStrategy, 'populate_exit_trend')
):
raise OperationalException( raise OperationalException(
"`populate_exit_trend` or `populate_sell_trend` must be implemented.") "`populate_exit_trend` or `populate_sell_trend` must be implemented.")
@ -253,3 +257,10 @@ class StrategyResolver(IResolver):
f"Impossible to load Strategy '{strategy_name}'. This class does not exist " f"Impossible to load Strategy '{strategy_name}'. This class does not exist "
"or contains Python code errors." "or contains Python code errors."
) )
def check_override(object, parentclass, attribute):
"""
Checks if a object overrides the parent class attribute.
"""
return getattr(type(object), attribute) == getattr(parentclass, attribute)

1
tests/strategy/test_strategy_loading.py
View File

@ -417,6 +417,7 @@ def test_missing_implements(result, default_conf):
match=r"`populate_entry_trend` must be implemented.*"): match=r"`populate_entry_trend` must be implemented.*"):
StrategyResolver.load_strategy(default_conf) StrategyResolver.load_strategy(default_conf)
@pytest.mark.filterwarnings("ignore:deprecated") @pytest.mark.filterwarnings("ignore:deprecated")
def test_call_deprecated_function(result, default_conf, caplog): def test_call_deprecated_function(result, default_conf, caplog):
default_location = Path(__file__).parent / "strats" default_location = Path(__file__).parent / "strats"