Raise exception if StaticPairList on a non-first position
This commit is contained in:
parent
c3206d72cb
commit
a484124272
@ -6,6 +6,7 @@ Provides pair white list as it configured in config
|
|||||||
import logging
|
import logging
|
||||||
from typing import Dict, List
|
from typing import Dict, List
|
||||||
|
|
||||||
|
from freqtrade.exceptions import OperationalException
|
||||||
from freqtrade.pairlist.IPairList import IPairList
|
from freqtrade.pairlist.IPairList import IPairList
|
||||||
|
|
||||||
|
|
||||||
@ -47,4 +48,8 @@ class StaticPairList(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
|
||||||
"""
|
"""
|
||||||
return pairlist
|
if self._pairlist_pos != 0:
|
||||||
|
raise OperationalException(f"{self.name} can only be used in the first position "
|
||||||
|
"in the list of Pairlist Handlers.")
|
||||||
|
else:
|
||||||
|
return pairlist
|
||||||
|
@ -279,28 +279,32 @@ def test_VolumePairList_refresh_empty(mocker, markets_empty, whitelist_conf):
|
|||||||
"BTC", ['ETH/BTC', 'TKN/BTC']),
|
"BTC", ['ETH/BTC', 'TKN/BTC']),
|
||||||
# PrecisionFilter only
|
# PrecisionFilter only
|
||||||
([{"method": "PrecisionFilter"}],
|
([{"method": "PrecisionFilter"}],
|
||||||
"BTC", None), # OperationalException expected
|
"BTC", 'filter_at_the_beginning'), # OperationalException expected
|
||||||
# PriceFilter after StaticPairList
|
# PriceFilter after StaticPairList
|
||||||
([{"method": "StaticPairList"},
|
([{"method": "StaticPairList"},
|
||||||
{"method": "PriceFilter", "low_price_ratio": 0.02}],
|
{"method": "PriceFilter", "low_price_ratio": 0.02}],
|
||||||
"BTC", ['ETH/BTC', 'TKN/BTC']),
|
"BTC", ['ETH/BTC', 'TKN/BTC']),
|
||||||
# PriceFilter only
|
# PriceFilter only
|
||||||
([{"method": "PriceFilter", "low_price_ratio": 0.02}],
|
([{"method": "PriceFilter", "low_price_ratio": 0.02}],
|
||||||
"BTC", None), # OperationalException expected
|
"BTC", 'filter_at_the_beginning'), # OperationalException expected
|
||||||
# ShuffleFilter after StaticPairList
|
# ShuffleFilter after StaticPairList
|
||||||
([{"method": "StaticPairList"},
|
([{"method": "StaticPairList"},
|
||||||
{"method": "ShuffleFilter", "seed": 42}],
|
{"method": "ShuffleFilter", "seed": 42}],
|
||||||
"BTC", ['TKN/BTC', 'ETH/BTC', 'HOT/BTC']),
|
"BTC", ['TKN/BTC', 'ETH/BTC', 'HOT/BTC']),
|
||||||
# ShuffleFilter only
|
# ShuffleFilter only
|
||||||
([{"method": "ShuffleFilter", "seed": 42}],
|
([{"method": "ShuffleFilter", "seed": 42}],
|
||||||
"BTC", None), # OperationalException expected
|
"BTC", 'filter_at_the_beginning'), # OperationalException expected
|
||||||
# SpreadFilter after StaticPairList
|
# SpreadFilter after StaticPairList
|
||||||
([{"method": "StaticPairList"},
|
([{"method": "StaticPairList"},
|
||||||
{"method": "SpreadFilter", "max_spread_ratio": 0.005}],
|
{"method": "SpreadFilter", "max_spread_ratio": 0.005}],
|
||||||
"BTC", ['ETH/BTC', 'TKN/BTC']),
|
"BTC", ['ETH/BTC', 'TKN/BTC']),
|
||||||
# SpreadFilter only
|
# SpreadFilter only
|
||||||
([{"method": "SpreadFilter", "max_spread_ratio": 0.005}],
|
([{"method": "SpreadFilter", "max_spread_ratio": 0.005}],
|
||||||
"BTC", None), # OperationalException expected
|
"BTC", 'filter_at_the_beginning'), # OperationalException expected
|
||||||
|
# Static Pairlist after VolumePairList, on a non-first position
|
||||||
|
([{"method": "VolumePairList", "number_assets": 5, "sort_key": "bidVolume"},
|
||||||
|
{"method": "StaticPairList"}],
|
||||||
|
"BTC", 'static_in_the_middle'),
|
||||||
])
|
])
|
||||||
def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, shitcoinmarkets, tickers,
|
def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, shitcoinmarkets, tickers,
|
||||||
pairlists, base_currency, whitelist_result,
|
pairlists, base_currency, whitelist_result,
|
||||||
@ -317,11 +321,16 @@ def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, shitcoinmarkets, t
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Set whitelist_result to None if pairlist is invalid and should produce exception
|
# Set whitelist_result to None if pairlist is invalid and should produce exception
|
||||||
if whitelist_result is None:
|
if whitelist_result == 'filter_at_the_beginning':
|
||||||
with pytest.raises(OperationalException,
|
with pytest.raises(OperationalException,
|
||||||
match=r"This Pairlist Handler should not be used at the first position "
|
match=r"This Pairlist Handler should not be used at the first position "
|
||||||
r"in the list of Pairlist Handlers."):
|
r"in the list of Pairlist Handlers."):
|
||||||
freqtrade.pairlists.refresh_pairlist()
|
freqtrade.pairlists.refresh_pairlist()
|
||||||
|
elif whitelist_result == 'static_in_the_middle':
|
||||||
|
with pytest.raises(OperationalException,
|
||||||
|
match=r"StaticPairList can only be used in the first position "
|
||||||
|
r"in the list of Pairlist Handlers."):
|
||||||
|
freqtrade.pairlists.refresh_pairlist()
|
||||||
else:
|
else:
|
||||||
freqtrade.pairlists.refresh_pairlist()
|
freqtrade.pairlists.refresh_pairlist()
|
||||||
whitelist = freqtrade.pairlists.whitelist
|
whitelist = freqtrade.pairlists.whitelist
|
||||||
|
Loading…
Reference in New Issue
Block a user