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

Merge pull request #1031 from freqtrade/feat/update_configdict

Browse Source 
Update config dict with attributes loaded from strategy
This commit is contained in:
Samuel Husso 2018-07-16 10:00:46 +03:00 committed by GitHub
commit a3466f4b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/strategy/resolver.py
View File

@ -41,12 +41,16 @@ class StrategyResolver(object):
if 'minimal_roi' in config: if 'minimal_roi' in config:
self.strategy.minimal_roi = config['minimal_roi'] self.strategy.minimal_roi = config['minimal_roi']
logger.info("Override strategy \'minimal_roi\' with value in config file.") logger.info("Override strategy \'minimal_roi\' with value in config file.")
else:
config['minimal_roi'] = self.strategy.minimal_roi
if 'stoploss' in config: if 'stoploss' in config:
self.strategy.stoploss = config['stoploss'] self.strategy.stoploss = config['stoploss']
logger.info( logger.info(
"Override strategy \'stoploss\' with value in config file: %s.", config['stoploss'] "Override strategy \'stoploss\' with value in config file: %s.", config['stoploss']
) )
else:
config['stoploss'] = self.strategy.stoploss
if 'ticker_interval' in config: if 'ticker_interval' in config:
self.strategy.ticker_interval = config['ticker_interval'] self.strategy.ticker_interval = config['ticker_interval']
@ -54,6 +58,8 @@ class StrategyResolver(object):
"Override strategy \'ticker_interval\' with value in config file: %s.", "Override strategy \'ticker_interval\' with value in config file: %s.",
config['ticker_interval'] config['ticker_interval']
) )
else:
config['ticker_interval'] = self.strategy.ticker_interval
# Sort and apply type conversions # Sort and apply type conversions
self.strategy.minimal_roi = OrderedDict(sorted( self.strategy.minimal_roi = OrderedDict(sorted(

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

@ -74,13 +74,21 @@ def test_load_not_found_strategy():
def test_strategy(result): def test_strategy(result):
resolver = StrategyResolver({'strategy': 'DefaultStrategy'}) config = {'strategy': 'DefaultStrategy'}
resolver = StrategyResolver(config)
assert hasattr(resolver.strategy, 'minimal_roi') assert hasattr(resolver.strategy, 'minimal_roi')
assert resolver.strategy.minimal_roi[0] == 0.04 assert resolver.strategy.minimal_roi[0] == 0.04
assert config["minimal_roi"]['0'] == 0.04
assert hasattr(resolver.strategy, 'stoploss') assert hasattr(resolver.strategy, 'stoploss')
assert resolver.strategy.stoploss == -0.10 assert resolver.strategy.stoploss == -0.10
assert config['stoploss'] == -0.10
assert hasattr(resolver.strategy, 'ticker_interval')
assert resolver.strategy.ticker_interval == '5m'
assert config['ticker_interval'] == '5m'
assert hasattr(resolver.strategy, 'populate_indicators') assert hasattr(resolver.strategy, 'populate_indicators')
assert 'adx' in resolver.strategy.populate_indicators(result) assert 'adx' in resolver.strategy.populate_indicators(result)