From d0521d33cedd079cff559a75571cb4cf2f9eef1d Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sat, 26 Oct 2019 09:38:29 +0200
Subject: [PATCH] Refactor whitelist handling

fixes #2413
---
 freqtrade/freqtradebot.py | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 6a1be16a1..f6f12f7f8 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -72,7 +72,7 @@ class FreqtradeBot:
         self.edge = Edge(self.config, self.exchange, self.strategy) if \
             self.config.get('edge', {}).get('enabled', False) else None
 
-        self.active_pair_whitelist: List[str] = self.config['exchange']['pair_whitelist']
+        self.active_pair_whitelist = self._refresh_whitelist()
 
         persistence.init(self.config.get('db_url', None),
                          clean_open_orders=self.config.get('dry_run', False))
@@ -118,21 +118,10 @@ class FreqtradeBot:
         # Check whether markets have to be reloaded
         self.exchange._reload_markets()
 
-        # Refresh whitelist
-        self.pairlists.refresh_pairlist()
-        self.active_pair_whitelist = self.pairlists.whitelist
-
-        # Calculating Edge positioning
-        if self.edge:
-            self.edge.calculate()
-            self.active_pair_whitelist = self.edge.adjust(self.active_pair_whitelist)
-
         # Query trades from persistence layer
         trades = Trade.get_open_trades()
 
-        # Extend active-pair whitelist with pairs from open trades
-        # It ensures that tickers are downloaded for open trades
-        self._extend_whitelist_with_trades(self.active_pair_whitelist, trades)
+        self.active_pair_whitelist = self._refresh_whitelist(trades)
 
         # Refreshing candles
         self.dataprovider.refresh(self._create_pair_whitelist(self.active_pair_whitelist),
@@ -150,11 +139,24 @@ class FreqtradeBot:
             self.check_handle_timedout()
             Trade.session.flush()
 
-    def _extend_whitelist_with_trades(self, whitelist: List[str], trades: List[Any]):
+    def _refresh_whitelist(self, trades: List[Trade] = []) -> List[str]:
         """
-        Extend whitelist with pairs from open trades
+        Refresh whitelist from pairlist or edge and extend it with trades.
         """
-        whitelist.extend([trade.pair for trade in trades if trade.pair not in whitelist])
+        # Refresh whitelist
+        self.pairlists.refresh_pairlist()
+        _whitelist = self.pairlists.whitelist
+
+        # Calculating Edge positioning
+        if self.edge:
+            self.edge.calculate()
+            _whitelist = self.edge.adjust(_whitelist)
+
+        if trades:
+            # Extend active-pair whitelist with pairs from open trades
+            # It ensures that tickers are downloaded for open trades
+            _whitelist.extend([trade.pair for trade in trades if trade.pair not in _whitelist])
+        return _whitelist
 
     def _create_pair_whitelist(self, pairs: List[str]) -> List[Tuple[str, str]]:
         """