From e1fca320e6e3e25ac33e5d5a692cc73a7e1050ec Mon Sep 17 00:00:00 2001 From: Sam Germain Date: Wed, 7 Jul 2021 22:51:10 -0600 Subject: [PATCH] passed mypy --- freqtrade/enums/interestmode.py | 1 + freqtrade/persistence/models.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/freqtrade/enums/interestmode.py b/freqtrade/enums/interestmode.py index a62e7ea5b..b9765e0e1 100644 --- a/freqtrade/enums/interestmode.py +++ b/freqtrade/enums/interestmode.py @@ -12,6 +12,7 @@ class InterestMode(Enum): HOURSPERDAY = "HOURSPERDAY" HOURSPER4 = "HOURSPER4" # Hours per 4 hour segment + NONE = "NONE" def __call__(self, *args, **kwargs): diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py index e38524ec6..53cce17f3 100644 --- a/freqtrade/persistence/models.py +++ b/freqtrade/persistence/models.py @@ -269,7 +269,7 @@ class LocalTrade(): liquidation_price: Optional[float] = None is_short: bool = False leverage: float = 1.0 - interest_mode: Optional[InterestMode] = None + interest_mode: InterestMode = InterestMode.NONE @property def has_no_leverage(self) -> bool: @@ -301,7 +301,8 @@ class LocalTrade(): def set_stop_loss_helper(self, stop_loss: Optional[float], liquidation_price: Optional[float]): # Stoploss would be better as a computed variable, # but that messes up the database so it might not be possible - # TODO-mg: What should be done about initial_stop_loss + + assert stop_loss or liquidation_price # programming error check if liquidation_price is not None: if stop_loss is not None: if self.is_short: @@ -313,9 +314,10 @@ class LocalTrade(): self.initial_stop_loss = liquidation_price self.liquidation_price = liquidation_price else: - if not self.stop_loss: - self.initial_stop_loss = stop_loss - self.stop_loss = stop_loss + if stop_loss: # Will always be true, here for mypy + if not self.stop_loss: + self.initial_stop_loss = stop_loss + self.stop_loss = stop_loss def set_stop_loss(self, stop_loss: float): self.set_stop_loss_helper(stop_loss=stop_loss, liquidation_price=self.liquidation_price) @@ -711,7 +713,7 @@ class LocalTrade(): return 0.0 else: if self.has_no_leverage: - # TODO: Use one profit_ratio calculation + # TODO-mg: Use one profit_ratio calculation profit_ratio = (close_trade_value/self.open_trade_value) - 1 else: if self.is_short: