diff --git a/freqtrade/plugins/pairlist/IPairList.py b/freqtrade/plugins/pairlist/IPairList.py index 95d776ae6..184feff9e 100644 --- a/freqtrade/plugins/pairlist/IPairList.py +++ b/freqtrade/plugins/pairlist/IPairList.py @@ -168,7 +168,7 @@ class IPairList(LoggingMixin, ABC): # Check if market is active market = markets[pair] if not market_is_active(market): - logger.info(f"Ignoring {pair} from whitelist. Market is not active.") + self.log_once(f"Ignoring {pair} from whitelist. Market is not active.", logger.info) continue if pair not in sanitized_whitelist: sanitized_whitelist.append(pair) diff --git a/freqtrade/plugins/pairlistmanager.py b/freqtrade/plugins/pairlistmanager.py index 7ce77da59..4e4135981 100644 --- a/freqtrade/plugins/pairlistmanager.py +++ b/freqtrade/plugins/pairlistmanager.py @@ -59,17 +59,6 @@ class PairListManager(): """The expanded blacklist (including wildcard expansion)""" return expand_pairlist(self._blacklist, self._exchange.get_markets().keys()) - @property - def expanded_whitelist_keep_invalid(self) -> List[str]: - """The expanded whitelist (including wildcard expansion), maintaining invalid pairs""" - return expand_pairlist(self._whitelist, self._exchange.get_markets().keys(), - keep_invalid=True) - - @property - def expanded_whitelist(self) -> List[str]: - """The expanded whitelist (including wildcard expansion), filtering invalid pairs""" - return expand_pairlist(self._whitelist, self._exchange.get_markets().keys()) - @property def name_list(self) -> List[str]: """Get list of loaded Pairlist Handler names""" @@ -153,10 +142,8 @@ class PairListManager(): :return: pairlist - whitelisted pairs """ try: - if keep_invalid: - whitelist = self.expanded_whitelist_keep_invalid - else: - whitelist = self.expanded_whitelist + + whitelist = expand_pairlist(pairlist, self._exchange.get_markets().keys(), keep_invalid) except ValueError as err: logger.error(f"Pair whitelist contains an invalid Wildcard: {err}") return []