diff --git a/freqtrade/exchange/binance.py b/freqtrade/exchange/binance.py index d23f84e7b..b71b58151 100644 --- a/freqtrade/exchange/binance.py +++ b/freqtrade/exchange/binance.py @@ -178,6 +178,8 @@ class Binance(Exchange): :param pair: The base/quote currency pair being traded :nominal_value: The total value of the trade in quote currency (collateral + debt) """ + if pair not in self._leverage_brackets: + return 1.0 pair_brackets = self._leverage_brackets[pair] max_lev = 1.0 for [min_amount, margin_req] in pair_brackets: diff --git a/freqtrade/exchange/ftx.py b/freqtrade/exchange/ftx.py index 4b3e765bb..066bd7704 100644 --- a/freqtrade/exchange/ftx.py +++ b/freqtrade/exchange/ftx.py @@ -29,7 +29,6 @@ class Ftx(Exchange): # (TradingMode.FUTURES, Collateral.CROSS) # TODO-lev: Uncomment once supported ] - def stoploss_adjust(self, stop_loss: float, order: Dict, side: str) -> bool: """ Verify stop_loss against stoploss-order value (limit or price) diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index 6cd009f96..55fc4463d 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -434,9 +434,9 @@ def test_list_markets(mocker, markets_static, capsys): ] start_list_markets(get_args(args), False) captured = capsys.readouterr() - assert ("Id,Symbol,Base,Quote,Active,Is pair" in captured.out) - assert ("blkbtc,BLK/BTC,BLK,BTC,True,True" in captured.out) - assert ("USD-LTC,LTC/USD,LTC,USD,True,True" in captured.out) + assert ("Id,Symbol,Base,Quote,Active,Spot,Margin,Future,Leverage" in captured.out) + assert ("blkbtc,BLK/BTC,BLK,BTC,True,Spot" in captured.out) + assert ("USD-LTC,LTC/USD,LTC,USD,True,Spot" in captured.out) # Test --one-column args = [ diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index 29a566747..0d033008a 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -2983,7 +2983,7 @@ def test_timeframe_to_next_date(): ("BTC-PERP", 'BTC', 'USD', "ftx", False, False, True, 'spot', {}, False), ("BTC-PERP", 'BTC', 'USD', "ftx", False, False, True, 'margin', {}, False), ("BTC-PERP", 'BTC', 'USD', "ftx", False, False, True, 'futures', {}, True), -]) + ]) def test_market_is_tradable( mocker, default_conf, market_symbol, base, quote, spot, margin, futures, trademode, add_dict, exchange, expected_result