adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve whitelist wordings

Browse Source
This commit is contained in:
Matthias
2019-04-03 19:51:46 +02:00
parent ab0e657d77
commit 3c399fbe3f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
freqtrade/freqtradebot.py
View File

@@ -79,7 +79,6 @@ class FreqtradeBot(object):
self.config.get('edge', {}).get('enabled', False) else None self.config.get('edge', {}).get('enabled', False) else None
self.active_pair_whitelist: List[str] = self.config['exchange']['pair_whitelist'] self.active_pair_whitelist: List[str] = self.config['exchange']['pair_whitelist']
self._init_modules() self._init_modules()
# Tell the systemd that we completed initialization phase # Tell the systemd that we completed initialization phase
@@ -196,9 +195,6 @@ class FreqtradeBot(object):
# Refresh whitelist # Refresh whitelist
self.pairlists.refresh_pairlist() self.pairlists.refresh_pairlist()
self.active_pair_whitelist = self.pairlists.whitelist self.active_pair_whitelist = self.pairlists.whitelist
if not self.active_pair_whitelist:
logger.warning('Whitelist is empty.')
return False
# Calculating Edge positioning # Calculating Edge positioning
if self.edge: if self.edge:
@@ -360,6 +356,10 @@ class FreqtradeBot(object):
interval = self.strategy.ticker_interval interval = self.strategy.ticker_interval
whitelist = copy.deepcopy(self.active_pair_whitelist) whitelist = copy.deepcopy(self.active_pair_whitelist)
if not whitelist:
logger.warning("Whitelist is empty.")
return False
# Remove currently opened and latest pairs from whitelist # Remove currently opened and latest pairs from whitelist
for trade in Trade.get_open_trades(): for trade in Trade.get_open_trades():
if trade.pair in whitelist: if trade.pair in whitelist:
@@ -367,7 +367,7 @@ class FreqtradeBot(object):
logger.debug('Ignoring %s in pair whitelist', trade.pair) logger.debug('Ignoring %s in pair whitelist', trade.pair)
if not whitelist: if not whitelist:
logger.info("No currency pair left in whitelist, no more trade can be created.") logger.info("No currency pair in whitelist, but checking to sell open trades.")
return False return False
# running get_signal on historical data fetched # running get_signal on historical data fetched