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

change short desc

Browse Source
This commit is contained in:
kevinjulian 2021-07-06 19:36:42 +07:00
parent 2d5ced7801
commit 502c69dce3
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
freqtrade/plugins/pairlist/AgeFilter.py
View File

@ -55,10 +55,13 @@ class AgeFilter(IPairList):
""" """
Short whitelist method description - used for startup-messages Short whitelist method description - used for startup-messages
""" """
return (f"{self.name} - Filtering pairs with age less than " return (
f"{self._min_days_listed} {plural(self._min_days_listed, 'day')}" f"{self.name} - Filtering pairs with age less than "
" or more than " f"{self._min_days_listed} {plural(self._min_days_listed, 'day')}"
f"{self._max_days_listed} {plural(self._max_days_listed, 'day')}") ) + (
" or more than "
f"{self._max_days_listed} {plural(self._max_days_listed, 'day')}"
) if self._max_days_listed else ''
def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]: def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
""" """
@ -105,10 +108,13 @@ class AgeFilter(IPairList):
self._symbolsChecked[pair] = int(arrow.utcnow().float_timestamp) * 1000 self._symbolsChecked[pair] = int(arrow.utcnow().float_timestamp) * 1000
return True return True
else: else:
self.log_once(f"Removed {pair} from whitelist, because age " self.log_once((
f"{len(daily_candles)} is less than {self._min_days_listed} " f"Removed {pair} from whitelist, because age "
f"{plural(self._min_days_listed, 'day')} or more than " f"{len(daily_candles)} is less than {self._min_days_listed} "
f"{self._max_days_listed} {plural(self._max_days_listed, 'day')}", f"{plural(self._min_days_listed, 'day')}"
logger.info) ) + (
" or more than "
f"{self._max_days_listed} {plural(self._max_days_listed, 'day')}"
) if self.max_days_listed else '', logger.info)
return False return False
return False return False

2
tests/plugins/test_pairlist.py
View File

@ -487,7 +487,7 @@ def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, shitcoinmarkets, t
if pairlist['method'] == 'AgeFilter' and pairlist['min_days_listed'] and \ if pairlist['method'] == 'AgeFilter' and pairlist['min_days_listed'] and \
len(ohlcv_history) < pairlist['min_days_listed']: len(ohlcv_history) < pairlist['min_days_listed']:
assert log_has_re(r'^Removed .* from whitelist, because age .* is less than ' assert log_has_re(r'^Removed .* from whitelist, because age .* is less than '
r'.* day.* or more than .* day', caplog) r'.* day.*', caplog)
if pairlist['method'] == 'AgeFilter' and pairlist['max_days_listed'] and \ if pairlist['method'] == 'AgeFilter' and pairlist['max_days_listed'] and \
len(ohlcv_history) > pairlist['max_days_listed']: len(ohlcv_history) > pairlist['max_days_listed']:
assert log_has_re(r'^Removed .* from whitelist, because age .* is less than ' assert log_has_re(r'^Removed .* from whitelist, because age .* is less than '