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

removed TODO-levs about okex liquidation price

Browse Source
This commit is contained in:
Sam Germain 2022-01-28 22:03:16 -06:00
parent d133a7c789
commit ede9012fcc
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
freqtrade/exchange/ftx.py
View File

@ -27,7 +27,6 @@ class Ftx(Exchange):
_supported_trading_mode_collateral_pairs: List[Tuple[TradingMode, Collateral]] = [ _supported_trading_mode_collateral_pairs: List[Tuple[TradingMode, Collateral]] = [
# TradingMode.SPOT always supported and not required in this list # TradingMode.SPOT always supported and not required in this list
# TODO-lev: Uncomment once supported
# (TradingMode.MARGIN, Collateral.CROSS), # (TradingMode.MARGIN, Collateral.CROSS),
# (TradingMode.FUTURES, Collateral.CROSS) # (TradingMode.FUTURES, Collateral.CROSS)
] ]

6
freqtrade/freqtradebot.py
View File

@ -636,12 +636,6 @@ class FreqtradeBot(LoggingMixin):
maintenance_amt=maintenance_amt, maintenance_amt=maintenance_amt,
mm_ratio=mm_ratio, mm_ratio=mm_ratio,
taker_fee_rate=taker_fee_rate taker_fee_rate=taker_fee_rate
# TODO-lev: Okex parameters
# liability: Optional[float]=None,
# interest: Optional[float]=None,
# position_assets: Optional[float]=None, # * Might be same as position
) )
else: else:
isolated_liq = self.exchange.get_liquidation_price(pair) isolated_liq = self.exchange.get_liquidation_price(pair)

4
tests/exchange/test_exchange.py
View File

@ -3451,9 +3451,7 @@ def test_set_margin_mode(mocker, default_conf, collateral):
("binance", TradingMode.FUTURES, Collateral.ISOLATED, False), ("binance", TradingMode.FUTURES, Collateral.ISOLATED, False),
("gateio", TradingMode.FUTURES, Collateral.ISOLATED, False), ("gateio", TradingMode.FUTURES, Collateral.ISOLATED, False),
("okex", TradingMode.FUTURES, Collateral.ISOLATED, False),
# ("okex", TradingMode.FUTURES, Collateral.ISOLATED, False), # TODO-lev: uncomment once impleme
("okex", TradingMode.FUTURES, Collateral.ISOLATED, True), # TODO-lev: remove once implemented
# * Remove once implemented # * Remove once implemented
("binance", TradingMode.MARGIN, Collateral.CROSS, True), ("binance", TradingMode.MARGIN, Collateral.CROSS, True),

7
tests/test_freqtradebot.py
View File

@ -712,13 +712,14 @@ def test_process_informative_pairs_added(default_conf_usdt, ticker_usdt, mocker)
(True, 'spot', 'binance', None, None), (True, 'spot', 'binance', None, None),
(False, 'spot', 'gateio', None, None), (False, 'spot', 'gateio', None, None),
(True, 'spot', 'gateio', None, None), (True, 'spot', 'gateio', None, None),
(False, 'spot', 'okex', None, None),
(True, 'spot', 'okex', None, None),
(True, 'futures', 'binance', 'isolated', 11.89108910891089), (True, 'futures', 'binance', 'isolated', 11.89108910891089),
(False, 'futures', 'binance', 'isolated', 8.070707070707071), (False, 'futures', 'binance', 'isolated', 8.070707070707071),
(True, 'futures', 'gateio', 'isolated', 11.87413417771621), (True, 'futures', 'gateio', 'isolated', 11.87413417771621),
(False, 'futures', 'gateio', 'isolated', 8.085708510208207), (False, 'futures', 'gateio', 'isolated', 8.085708510208207),
# TODO-lev: Okex (True, 'futures', 'okex', 'isolated', 11.87413417771621),
# (False, 'spot', 'okex', 'isolated', ...), (False, 'futures', 'okex', 'isolated', 8.085708510208207),
# (True, 'futures', 'okex', 'isolated', ...),
]) ])
def test_execute_entry(mocker, default_conf_usdt, fee, limit_order, def test_execute_entry(mocker, default_conf_usdt, fee, limit_order,
limit_order_open, is_short, trading_mode, limit_order_open, is_short, trading_mode,