From 0affacd39aa808d60d130b0518eaf698c53399ae Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Wed, 30 Dec 2020 10:14:22 +0100
Subject: [PATCH] Support invalid regex blacklist from config

---
 freqtrade/plugins/pairlist/pairlist_helpers.py |  7 ++++++-
 freqtrade/plugins/pairlistmanager.py           |  7 ++++++-
 tests/plugins/test_pairlist.py                 | 17 +++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/freqtrade/plugins/pairlist/pairlist_helpers.py b/freqtrade/plugins/pairlist/pairlist_helpers.py
index 7d365a344..0a0812d6a 100644
--- a/freqtrade/plugins/pairlist/pairlist_helpers.py
+++ b/freqtrade/plugins/pairlist/pairlist_helpers.py
@@ -4,7 +4,12 @@ from typing import List
 
 def expand_pairlist(wildcardpl: List[str], available_pairs: List[str]) -> List[str]:
     """
-    TODO: Add docstring here
+    Expand pairlist potentially containing wildcards based on available markets.
+    This will implicitly filter all pairs in the wildcard-list which are not in available_pairs.
+    :param wildcardpl: List of Pairlists, which may contain regex
+    :param available_pairs: List of all available pairs, usually with `exchange.get_markets().keys()`
+    :return expanded pairlist, with Regexes from wildcardpl applied to match all available pairs.
+    :raises: ValueError if a wildcard is invalid (like '*/BTC' - which should be `.*/BTC`)
     """
     result = []
     for pair_wc in wildcardpl:
diff --git a/freqtrade/plugins/pairlistmanager.py b/freqtrade/plugins/pairlistmanager.py
index ea1f4ecc7..a0b8c63bc 100644
--- a/freqtrade/plugins/pairlistmanager.py
+++ b/freqtrade/plugins/pairlistmanager.py
@@ -128,8 +128,13 @@ class PairListManager():
         :param logmethod: Function that'll be called, `logger.info` or `logger.warning`.
         :return: pairlist - blacklisted pairs
         """
+        try:
+            blacklist = self.expanded_blacklist
+        except ValueError as err:
+            logger.error(f"Pair blacklist contains an invalid Wildcard: {err}")
+            return []
         for pair in deepcopy(pairlist):
-            if pair in self.expanded_blacklist:
+            if pair in blacklist:
                 logmethod(f"Pair {pair} in your blacklist. Removing it from whitelist...")
                 pairlist.remove(pair)
         return pairlist
diff --git a/tests/plugins/test_pairlist.py b/tests/plugins/test_pairlist.py
index 25597ef93..d822f8319 100644
--- a/tests/plugins/test_pairlist.py
+++ b/tests/plugins/test_pairlist.py
@@ -156,6 +156,23 @@ def test_refresh_static_pairlist(mocker, markets, static_pl_conf):
     assert static_pl_conf['exchange']['pair_blacklist'] == freqtrade.pairlists.blacklist
 
 
+def test_invalid_blacklist(mocker, markets, static_pl_conf, caplog):
+    static_pl_conf['exchange']['pair_blacklist'] = ['*/BTC']
+    freqtrade = get_patched_freqtradebot(mocker, static_pl_conf)
+    mocker.patch.multiple(
+        'freqtrade.exchange.Exchange',
+        exchange_has=MagicMock(return_value=True),
+        markets=PropertyMock(return_value=markets),
+    )
+    freqtrade.pairlists.refresh_pairlist()
+    # List ordered by BaseVolume
+    whitelist = []
+    # Ensure all except those in whitelist are removed
+    assert set(whitelist) == set(freqtrade.pairlists.whitelist)
+    assert static_pl_conf['exchange']['pair_blacklist'] == freqtrade.pairlists.blacklist
+    log_has_re(r"Pair blacklist contains an invalid Wildcard.*", caplog)
+
+
 def test_refresh_pairlist_dynamic(mocker, shitcoinmarkets, tickers, whitelist_conf):
 
     mocker.patch.multiple(