diff --git a/freqtrade/enums/marginmode.py b/freqtrade/enums/marginmode.py index 0e8887a9a..9aa814c39 100644 --- a/freqtrade/enums/marginmode.py +++ b/freqtrade/enums/marginmode.py @@ -11,3 +11,6 @@ class MarginMode(str, Enum): CROSS = "cross" ISOLATED = "isolated" NONE = "" + + def __str__(self): + return f"{self.name.lower()}" diff --git a/freqtrade/enums/tradingmode.py b/freqtrade/enums/tradingmode.py index 62f9b4255..a681d60f9 100644 --- a/freqtrade/enums/tradingmode.py +++ b/freqtrade/enums/tradingmode.py @@ -10,3 +10,6 @@ class TradingMode(str, Enum): SPOT = "spot" MARGIN = "margin" FUTURES = "futures" + + def __str__(self): + return f"{self.name.lower()}" diff --git a/freqtrade/exchange/binance.py b/freqtrade/exchange/binance.py index d2e74f9eb..d7fb0a353 100644 --- a/freqtrade/exchange/binance.py +++ b/freqtrade/exchange/binance.py @@ -192,7 +192,7 @@ class Binance(Exchange): if maintenance_amt is None: raise OperationalException( "Parameter maintenance_amt is required by Binance.liquidation_price" - f"for {self.trading_mode.value}" + f"for {self.trading_mode}" ) if self.trading_mode == TradingMode.FUTURES: diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index cb1c1a49a..684eaa5d8 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -707,7 +707,7 @@ class Exchange: # Note: ccxt has BaseCurrency/QuoteCurrency format for pairs if self.markets and pair not in self.markets: raise OperationalException( - f"Pair {pair} is not available on {self.name} {self.trading_mode.value}. " + f"Pair {pair} is not available on {self.name} {self.trading_mode}. " f"Please remove {pair} from your whitelist." ) @@ -890,7 +890,7 @@ class Exchange: ): mm_value = margin_mode and margin_mode.value raise OperationalException( - f"Freqtrade does not support {mm_value} {trading_mode.value} on {self.name}" + f"Freqtrade does not support {mm_value} {trading_mode} on {self.name}" ) def get_option(self, param: str, default: Optional[Any] = None) -> Any: diff --git a/freqtrade/persistence/trade_model.py b/freqtrade/persistence/trade_model.py index 4e7f01906..49afd927b 100644 --- a/freqtrade/persistence/trade_model.py +++ b/freqtrade/persistence/trade_model.py @@ -623,7 +623,7 @@ class LocalTrade: self.orders = [] if self.trading_mode == TradingMode.MARGIN and self.interest_rate is None: raise OperationalException( - f"{self.trading_mode.value} trading requires param interest_rate on trades" + f"{self.trading_mode} trading requires param interest_rate on trades" ) def __repr__(self): @@ -1079,7 +1079,7 @@ class LocalTrade: return float(self._calc_base_close(amount1, rate, self.fee_close)) + funding_fees else: raise OperationalException( - f"{self.trading_mode.value} trading is not yet available using freqtrade" + f"{self.trading_mode} trading is not yet available using freqtrade" ) def calc_profit(