From af59572cb9a7abd5286540de3dc3a38fb355cc64 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 25 Sep 2022 19:32:39 +0200 Subject: [PATCH] prior pairlists should go first --- freqtrade/plugins/pairlist/ProducerPairList.py | 2 +- tests/plugins/test_pairlist.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/freqtrade/plugins/pairlist/ProducerPairList.py b/freqtrade/plugins/pairlist/ProducerPairList.py index fa351c9cc..50b674e60 100644 --- a/freqtrade/plugins/pairlist/ProducerPairList.py +++ b/freqtrade/plugins/pairlist/ProducerPairList.py @@ -62,7 +62,7 @@ class ProducerPairList(IPairList): if pairlist is None: pairlist = self._pairlistmanager._dataprovider.get_producer_pairs(self._producer_name) - pairs = list(dict.fromkeys(upstream_pairlist + pairlist)) + pairs = list(dict.fromkeys(pairlist + upstream_pairlist)) if self._num_assets: pairs = pairs[:self._num_assets] diff --git a/tests/plugins/test_pairlist.py b/tests/plugins/test_pairlist.py index a6b5813da..82fc99d7a 100644 --- a/tests/plugins/test_pairlist.py +++ b/tests/plugins/test_pairlist.py @@ -1413,3 +1413,16 @@ def test_ProducerPairlist(mocker, whitelist_conf, markets): # Pairlist reduced to 2 assert pm.whitelist == pairs[:2] assert len(pm.whitelist) == 2 + whitelist_conf['exchange']['pair_whitelist'] = ['TKN/BTC'] + + whitelist_conf['pairlists'] = [ + {"method": "StaticPairList"}, + { + "method": "ProducerPairList", + "producer_name": "hello_world", + } + ] + pm = PairListManager(exchange, whitelist_conf, dp) + pm.refresh_pairlist() + assert len(pm.whitelist) == 4 + assert pm.whitelist == ['TKN/BTC'] + pairs