From 0e62b8bd8502d70c9675bcbf0327fde076494461 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 26 Aug 2019 20:16:03 +0200 Subject: [PATCH] Update strategy_version to INTERFACE_VERSION --- freqtrade/resolvers/strategy_resolver.py | 2 +- freqtrade/strategy/default_strategy.py | 2 +- freqtrade/strategy/interface.py | 4 ++-- freqtrade/tests/strategy/test_strategy.py | 6 +++--- user_data/strategies/test_strategy.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/freqtrade/resolvers/strategy_resolver.py b/freqtrade/resolvers/strategy_resolver.py index 4e6ef154b..514e9f22b 100644 --- a/freqtrade/resolvers/strategy_resolver.py +++ b/freqtrade/resolvers/strategy_resolver.py @@ -156,7 +156,7 @@ class StrategyResolver(IResolver): if any([x == 2 for x in [strategy._populate_fun_len, strategy._buy_fun_len, strategy._sell_fun_len]]): - strategy.strategy_version = 1 + strategy.INTERFACE_VERSION = 1 try: return import_strategy(strategy, config=config) diff --git a/freqtrade/strategy/default_strategy.py b/freqtrade/strategy/default_strategy.py index 51ef49193..4907f20ed 100644 --- a/freqtrade/strategy/default_strategy.py +++ b/freqtrade/strategy/default_strategy.py @@ -13,7 +13,7 @@ class DefaultStrategy(IStrategy): Default Strategy provided by freqtrade bot. You can override it with your own strategy """ - strategy_version: int = 2 + INTERFACE_VERSION = 2 # Minimal ROI designed for the strategy minimal_roi = { diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 4133d31a9..3f2478cc0 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -62,9 +62,9 @@ class IStrategy(ABC): """ # Strategy interface version # Default to version 2 - # version 1 is the initial interface without metadata dict + # Version 1 is the initial interface without metadata dict # Version 2 populate_* include metadata dict - strategy_version: int = 2 + INTERFACE_VERSION: int = 2 _populate_fun_len: int = 0 _buy_fun_len: int = 0 diff --git a/freqtrade/tests/strategy/test_strategy.py b/freqtrade/tests/strategy/test_strategy.py index 28acdea61..b1a6a6548 100644 --- a/freqtrade/tests/strategy/test_strategy.py +++ b/freqtrade/tests/strategy/test_strategy.py @@ -380,7 +380,7 @@ def test_call_deprecated_function(result, monkeypatch, default_conf): assert resolver.strategy._populate_fun_len == 2 assert resolver.strategy._buy_fun_len == 2 assert resolver.strategy._sell_fun_len == 2 - assert resolver.strategy.strategy_version == 1 + assert resolver.strategy.INTERFACE_VERSION == 1 indicator_df = resolver.strategy.advise_indicators(result, metadata=metadata) assert isinstance(indicator_df, DataFrame) @@ -395,7 +395,7 @@ def test_call_deprecated_function(result, monkeypatch, default_conf): assert 'sell' in selldf -def test_strategy_versioning(result, monkeypatch, default_conf): +def test_strategy_interface_versioning(result, monkeypatch, default_conf): default_conf.update({'strategy': 'DefaultStrategy'}) resolver = StrategyResolver(default_conf) metadata = {'pair': 'ETH/BTC'} @@ -404,7 +404,7 @@ def test_strategy_versioning(result, monkeypatch, default_conf): assert resolver.strategy._populate_fun_len == 3 assert resolver.strategy._buy_fun_len == 3 assert resolver.strategy._sell_fun_len == 3 - assert resolver.strategy.strategy_version == 2 + assert resolver.strategy.INTERFACE_VERSION == 2 indicator_df = resolver.strategy.advise_indicators(result, metadata=metadata) assert isinstance(indicator_df, DataFrame) diff --git a/user_data/strategies/test_strategy.py b/user_data/strategies/test_strategy.py index 876a2845a..8e2bf8973 100644 --- a/user_data/strategies/test_strategy.py +++ b/user_data/strategies/test_strategy.py @@ -30,7 +30,7 @@ class TestStrategy(IStrategy): """ # Strategy intervace version - allow new iterations of the strategy interface. # Check the documentation or the Sample strategy to get the latest version. - strategy_version: int = 2 + INTERFACE_VERSION = 2 # Minimal ROI designed for the strategy. # This attribute will be overridden if the config file contains "minimal_roi"