From fac0e4e603109856c7ca877f0e75f59570cece35 Mon Sep 17 00:00:00 2001 From: hroff-1902 Date: Wed, 20 Feb 2019 15:56:26 +0300 Subject: [PATCH] more code cleanup in _process() --- freqtrade/freqtradebot.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index eda648a64..6f884a98f 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -163,11 +163,11 @@ class FreqtradeBot(object): self.active_pair_whitelist = self.edge.adjust(self.active_pair_whitelist) # Query trades from persistence layer - trades = Trade.query.filter(Trade.is_open.is_(True)).all() + trades = self._query_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) + self._extend_whitelist_with_trades(self.active_pair_whitelist, trades) # Refreshing candles self.dataprovider.refresh(self._create_pair_whitelist(self.active_pair_whitelist), @@ -200,10 +200,11 @@ class FreqtradeBot(object): self.state = State.STOPPED return state_changed - def _extend_whitelist_with_trades(self, whitelist: List[str]): + def _query_trades(self) -> List[Any]: # Query trades from persistence layer - trades = Trade.query.filter(Trade.is_open.is_(True)).all() + return Trade.query.filter(Trade.is_open.is_(True)).all() + def _extend_whitelist_with_trades(self, whitelist: List[str], trades: List[Any]): # Extend whitelist with pairs from open trades whitelist.extend([trade.pair for trade in trades if trade.pair not in whitelist])