From b72078e76eacb50733158ca78c891ae7b955bcaa Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 27 Jan 2024 16:07:55 +0100 Subject: [PATCH] use get_pair_base_currency --- freqtrade/plugins/pairlist/MarketCapPairList.py | 2 +- tests/plugins/test_pairlist.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/freqtrade/plugins/pairlist/MarketCapPairList.py b/freqtrade/plugins/pairlist/MarketCapPairList.py index c0232e0d0..afe47bdce 100644 --- a/freqtrade/plugins/pairlist/MarketCapPairList.py +++ b/freqtrade/plugins/pairlist/MarketCapPairList.py @@ -153,7 +153,7 @@ class MarketCapPairList(IPairList): top_marketcap = marketcap_list[:self._number_assets:] for pair in pairlist: - base = pair.split('/')[0] + base = self._exchange.get_pair_base_currency(pair) if base.lower() in top_marketcap: filtered_pairlist.append(pair) else: diff --git a/tests/plugins/test_pairlist.py b/tests/plugins/test_pairlist.py index e19968482..1f3f0d16a 100644 --- a/tests/plugins/test_pairlist.py +++ b/tests/plugins/test_pairlist.py @@ -1542,7 +1542,7 @@ def test_FullTradesFilter(mocker, default_conf_usdt, fee, caplog) -> None: {"method": "MarketCapPairList", "mode": "total_assets", "number_assets": 5} ], ['ETH/USDT', 'XRP/USDT']) ]) -def test_MarketCapPairList_filter(mocker, default_conf_usdt, pairlists, result): +def test_MarketCapPairList_filter(mocker, default_conf_usdt, markets, pairlists, result): test_value = [ { "symbol": "btc", @@ -1579,7 +1579,10 @@ def test_MarketCapPairList_filter(mocker, default_conf_usdt, pairlists, result): default_conf_usdt['exchange']['pair_whitelist'].extend(['BTC/USDT', 'ETC/USDT']) default_conf_usdt['trading_mode'] = 'spot' default_conf_usdt['pairlists'] = pairlists - mocker.patch(f'{EXMS}.exchange_has', MagicMock(return_value=True)) + mocker.patch.multiple(EXMS, + markets=PropertyMock(return_value=markets), + exchange_has=MagicMock(return_value=True), + ) mocker.patch("freqtrade.plugins.pairlist.MarketCapPairList.CoinGeckoAPI.get_coins_markets", return_value=test_value)