CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 08:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy up codes

Browse Source
This commit is contained in:
Stefano Ariestasia
2024-01-08 16:02:31 +09:00
parent 442ca86d15
commit fdf9cc1b76
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
freqtrade/plugins/pairlist/MarketCapFilter.py
View File

@@ -11,7 +11,6 @@ from cachetools import TTLCache
from freqtrade.constants import Config, ListPairsWithTimeframes from freqtrade.constants import Config, ListPairsWithTimeframes
from freqtrade.exceptions import OperationalException from freqtrade.exceptions import OperationalException
from freqtrade.exchange import timeframe_to_minutes, timeframe_to_prev_date
from freqtrade.exchange.types import Tickers from freqtrade.exchange.types import Tickers
from freqtrade.plugins.pairlist.IPairList import IPairList, PairlistParameter from freqtrade.plugins.pairlist.IPairList import IPairList, PairlistParameter
from freqtrade.util import dt_now, format_ms_time from freqtrade.util import dt_now, format_ms_time
@@ -110,8 +109,7 @@ class MarketCapFilter(IPairList):
""" """
# Generate dynamic whitelist # Generate dynamic whitelist
# Must always run if this pairlist is not the first in the list. # Must always run if this pairlist is not the first in the list.
# pairlist = self._marketcap_cache.get('pairlist_mc') pairlist = self._marketcap_cache.get('pairlist_mc')
pairlist=[]
if pairlist: if pairlist:
# Item found - no refresh necessary # Item found - no refresh necessary
return pairlist.copy() return pairlist.copy()
@@ -126,7 +124,7 @@ class MarketCapFilter(IPairList):
_pairlist = self.verify_blacklist(_pairlist, logger.info) _pairlist = self.verify_blacklist(_pairlist, logger.info)
pairlist = self.filter_pairlist(_pairlist, tickers) pairlist = self.filter_pairlist(_pairlist, tickers)
# self._marketcap_cache['pairlist_mc'] = pairlist.copy() self._marketcap_cache['pairlist_mc'] = pairlist.copy()
return pairlist return pairlist
@@ -138,8 +136,7 @@ class MarketCapFilter(IPairList):
:param tickers: Tickers (from exchange.get_tickers). May be cached. :param tickers: Tickers (from exchange.get_tickers). May be cached.
:return: new whitelist :return: new whitelist
""" """
# marketcap_list = self._marketcap_cache.get('marketcap') marketcap_list = self._marketcap_cache.get('marketcap')
marketcap_list = []
can_filter = False can_filter = False
if marketcap_list: if marketcap_list:
@@ -175,7 +172,8 @@ class MarketCapFilter(IPairList):
else: else:
market = self._config['trading_mode'] market = self._config['trading_mode']
pair_format = f"{self._stake_currency.upper()}" if (market == 'spot') else f"{self._stake_currency.upper()}:{self._stake_currency.upper()}" pair_format = f"{self._stake_currency.upper()}" if (market == 'spot')
else f"{self._stake_currency.upper()}:{self._stake_currency.upper()}"
for mc_pair in marketcap_list: for mc_pair in marketcap_list:
test_pair = f"{mc_pair.upper()}/{pair_format}" test_pair = f"{mc_pair.upper()}/{pair_format}"
if test_pair in pairlist: if test_pair in pairlist:
@@ -186,5 +184,4 @@ class MarketCapFilter(IPairList):
if len(filtered_pairlist) > 0: if len(filtered_pairlist) > 0:
return filtered_pairlist return filtered_pairlist
return pairlist return pairlist