diff --git a/freqtrade/exchange/ftx.py b/freqtrade/exchange/ftx.py index e22281faf..e28c6bc45 100644 --- a/freqtrade/exchange/ftx.py +++ b/freqtrade/exchange/ftx.py @@ -27,7 +27,6 @@ class Ftx(Exchange): _supported_trading_mode_collateral_pairs: List[Tuple[TradingMode, Collateral]] = [ # TradingMode.SPOT always supported and not required in this list - # TODO-lev: Uncomment once supported # (TradingMode.MARGIN, Collateral.CROSS), # (TradingMode.FUTURES, Collateral.CROSS) ] diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 2911b8ea4..0485e9cc3 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -636,12 +636,6 @@ class FreqtradeBot(LoggingMixin): maintenance_amt=maintenance_amt, mm_ratio=mm_ratio, 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: isolated_liq = self.exchange.get_liquidation_price(pair) diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index 22e92c9fd..7ba9bb2ee 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -3451,9 +3451,7 @@ def test_set_margin_mode(mocker, default_conf, collateral): ("binance", TradingMode.FUTURES, Collateral.ISOLATED, False), ("gateio", 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 + ("okex", TradingMode.FUTURES, Collateral.ISOLATED, False), # * Remove once implemented ("binance", TradingMode.MARGIN, Collateral.CROSS, True), diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 7c266b156..e42a7ce88 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -712,13 +712,14 @@ def test_process_informative_pairs_added(default_conf_usdt, ticker_usdt, mocker) (True, 'spot', 'binance', None, None), (False, '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), (False, 'futures', 'binance', 'isolated', 8.070707070707071), (True, 'futures', 'gateio', 'isolated', 11.87413417771621), (False, 'futures', 'gateio', 'isolated', 8.085708510208207), - # TODO-lev: Okex - # (False, 'spot', 'okex', 'isolated', ...), - # (True, 'futures', 'okex', 'isolated', ...), + (True, 'futures', 'okex', 'isolated', 11.87413417771621), + (False, 'futures', 'okex', 'isolated', 8.085708510208207), ]) def test_execute_entry(mocker, default_conf_usdt, fee, limit_order, limit_order_open, is_short, trading_mode,