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

Revert "Added Margin Mode Check for Binance."

Browse Source 
This reverts commit abcb9729e5.
This commit is contained in:
Sam Germain 2021-09-19 17:16:59 -06:00
parent 1299cff894
commit b30458f871
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
freqtrade/leverage/liquidation_price.py
View File

@ -10,8 +10,7 @@ def liquidation_price(
is_short: bool, is_short: bool,
leverage: float, leverage: float,
trading_mode: TradingMode, trading_mode: TradingMode,
collateral: Optional[Collateral], collateral: Optional[Collateral]
margin_mode: Optional[MarginMode]
) -> Optional[float]: ) -> Optional[float]:
if trading_mode == TradingMode.SPOT: if trading_mode == TradingMode.SPOT:
return None return None
@ -23,11 +22,7 @@ def liquidation_price(
) )
if exchange_name.lower() == "binance": if exchange_name.lower() == "binance":
if not margin_mode: return binance(open_rate, is_short, leverage, trading_mode, collateral)
raise OperationalException(
f"Parameter margin_mode is required by liquidation_price when exchange is {trading_mode}")
return binance(open_rate, is_short, leverage, margin_mode, trading_mode, collateral)
elif exchange_name.lower() == "kraken": elif exchange_name.lower() == "kraken":
return kraken(open_rate, is_short, leverage, trading_mode, collateral) return kraken(open_rate, is_short, leverage, trading_mode, collateral)
elif exchange_name.lower() == "ftx": elif exchange_name.lower() == "ftx":
@ -41,7 +36,7 @@ def exception(
exchange: str, exchange: str,
trading_mode: TradingMode, trading_mode: TradingMode,
collateral: Collateral, collateral: Collateral,
margin_mode: Optional[MarginMode] = None margin_mode: Optional[MarginMode]
): ):
""" """
Raises an exception if exchange used doesn't support desired leverage mode Raises an exception if exchange used doesn't support desired leverage mode
@ -188,6 +183,7 @@ def kraken(
open_rate: float, open_rate: float,
is_short: bool, is_short: bool,
leverage: float, leverage: float,
margin_mode: MarginMode,
trading_mode: TradingMode, trading_mode: TradingMode,
collateral: Collateral collateral: Collateral
): ):
@ -196,6 +192,7 @@ def kraken(
:param open_rate: open_rate :param open_rate: open_rate
:param is_short: true or false :param is_short: true or false
:param leverage: leverage in float :param leverage: leverage in float
:param margin_mode: one-way or hedge
:param trading_mode: spot, margin, futures :param trading_mode: spot, margin, futures
:param collateral: cross, isolated :param collateral: cross, isolated
""" """
@ -207,16 +204,17 @@ def kraken(
# TODO-lev: perform a calculation based on this formula # TODO-lev: perform a calculation based on this formula
# https://support.kraken.com/hc/en-us/articles/203325763-Margin-Call-Level-and-Margin-Liquidation-Level # https://support.kraken.com/hc/en-us/articles/203325763-Margin-Call-Level-and-Margin-Liquidation-Level
elif trading_mode == TradingMode.FUTURES: elif trading_mode == TradingMode.FUTURES:
exception("kraken", trading_mode, collateral) exception("kraken", trading_mode, collateral, margin_mode)
# If nothing was returned # If nothing was returned
exception("kraken", trading_mode, collateral) exception("kraken", trading_mode, collateral, margin_mode)
def ftx( def ftx(
open_rate: float, open_rate: float,
is_short: bool, is_short: bool,
leverage: float, leverage: float,
margin_mode: MarginMode,
trading_mode: TradingMode, trading_mode: TradingMode,
collateral: Collateral collateral: Collateral
): ):
@ -225,12 +223,13 @@ def ftx(
:param open_rate: open_rate :param open_rate: open_rate
:param is_short: true or false :param is_short: true or false
:param leverage: leverage in float :param leverage: leverage in float
:param margin_mode: one-way or hedge
:param trading_mode: spot, margin, futures :param trading_mode: spot, margin, futures
:param collateral: cross, isolated :param collateral: cross, isolated
""" """
if collateral == Collateral.CROSS: if collateral == Collateral.CROSS:
# TODO-lev: Additional arguments, fill in formulas # TODO-lev: Additional arguments, fill in formulas
exception("ftx", trading_mode, collateral) exception("ftx", trading_mode, collateral, margin_mode)
# If nothing was returned # If nothing was returned
exception("ftx", trading_mode, collateral) exception("ftx", trading_mode, collateral, margin_mode)