From 4c1705fb1e552d13f854934dc23acac5b8bf73d5 Mon Sep 17 00:00:00 2001 From: hroff-1902 Date: Fri, 11 Oct 2019 22:59:13 +0300 Subject: [PATCH] No specific handling for trailing_stop_positive --- freqtrade/resolvers/strategy_resolver.py | 5 ++++- freqtrade/strategy/interface.py | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/freqtrade/resolvers/strategy_resolver.py b/freqtrade/resolvers/strategy_resolver.py index 43197e5bc..b9c641853 100644 --- a/freqtrade/resolvers/strategy_resolver.py +++ b/freqtrade/resolvers/strategy_resolver.py @@ -95,7 +95,10 @@ class StrategyResolver(IResolver): logger.info("Override strategy '%s' with value in config file: %s.", attribute, config[attribute]) elif hasattr(self.strategy, attribute): - config[attribute] = getattr(self.strategy, attribute) + val = getattr(self.strategy, attribute) + # None's cannot exist in the config, so do not copy them + if val is not None: + config[attribute] = val # Explicitly check for None here as other "falsy" values are possible elif default is not None: setattr(self.strategy, attribute, default) diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 9c6936c20..e4cfe0088 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -78,7 +78,7 @@ class IStrategy(ABC): # trailing stoploss trailing_stop: bool = False - trailing_stop_positive: float + trailing_stop_positive: Optional[float] = None trailing_stop_positive_offset: float = 0.0 trailing_only_offset_is_reached = False @@ -361,8 +361,7 @@ class IStrategy(ABC): # Don't update stoploss if trailing_only_offset_is_reached is true. if not (self.trailing_only_offset_is_reached and high_profit < sl_offset): - # Specific handling for trailing_stop_positive - if 'trailing_stop_positive' in self.__dict__ and high_profit > sl_offset: + if self.trailing_stop_positive is not None and high_profit > sl_offset: # Ignore mypy error check in configuration that this is a float stop_loss_value = self.trailing_stop_positive logger.debug(f"{trade.pair} - Using positive stoploss: {stop_loss_value} "