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

remove short logic in entry_price_reached function

Browse Source
This commit is contained in:
axel 2021-08-03 16:19:29 -04:00
parent d9c9b7d7fc
commit 53fb8b05e7
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freqtrade/strategy/interface.py
View File

@ -281,7 +281,7 @@ class IStrategy(ABC, HyperStrategyMixin):
return self.stoploss return self.stoploss
def custom_entry_price(self, pair: str, current_time: datetime, proposed_rate: float, def custom_entry_price(self, pair: str, current_time: datetime, proposed_rate: float,
**kwargs) -> float: **kwargs) -> float:
""" """
Custom entry price logic, returning the new entry price. Custom entry price logic, returning the new entry price.
@ -654,8 +654,8 @@ class IStrategy(ABC, HyperStrategyMixin):
return SellCheckTuple(sell_type=SellType.NONE) return SellCheckTuple(sell_type=SellType.NONE)
def entry_price_reached(self, pair: str, current_rate: float, def entry_price_reached(self, pair: str, current_rate: float,
current_time: datetime, low: float = None, current_time: datetime, low: float = None,
high: float = None, side: str = "long") -> bool: high: float = None) -> bool:
""" """
Based on current candle low ,decides if entry price was reached Based on current candle low ,decides if entry price was reached
:param current_rate: current rate :param current_rate: current rate
@ -668,23 +668,12 @@ class IStrategy(ABC, HyperStrategyMixin):
)(pair=pair, )(pair=pair,
current_time=current_time, current_time=current_time,
current_rate=current_rate) current_rate=current_rate)
# Sanity check - error cases will return None
if side == "long": if entry_price_value is not None:
if entry_price_value > low: if entry_price_value > low:
return True return True
else: else:
logger.info(f"Entry failed because entry price {entry_price_value} \
higher than candle low in long side")
return False return False
elif side == "short":
if entry_price_value < high:
return True
else:
logger.info(f"Entry failed because entry price {entry_price_value} \
higher than candle high in short side")
return False
else: else:
logger.warning("CustomEntryPrice function did not return valid entry price") logger.warning("CustomEntryPrice function did not return valid entry price")
return False return False