lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-10 02:12:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update strategy_version to INTERFACE_VERSION

Browse Source
This commit is contained in:
Matthias 2019-08-26 20:16:03 +02:00
parent 92011f8294
commit 0e62b8bd85
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/resolvers/strategy_resolver.py
View File

@ -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)

2
freqtrade/strategy/default_strategy.py
View File

@ -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 = {

4
freqtrade/strategy/interface.py
View File

@ -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

6
freqtrade/tests/strategy/test_strategy.py
View File

@ -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)

2
user_data/strategies/test_strategy.py
View File

@ -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"