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

fix for issue #283

Browse Source
This commit is contained in:
Jean-Baptiste LE STANG 2018-01-02 12:04:47 +01:00
parent 0c11d4443f
commit 52e267e864
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freqtrade/main.py
View File

@ -27,23 +27,28 @@ _CONF = {}
def refresh_whitelist(whitelist: List[str]) -> List[str]: def refresh_whitelist(whitelist: List[str]) -> List[str]:
""" """
Check wallet health and remove pair from whitelist if necessary Check wallet health and remove pair from whitelist if necessary
:param whitelist: the pair the user might want to trade :param whitelist: the sorted list (based on BaseVolume) of pairs the user might want to trade
:return: the list of pairs the user wants to trade without the one unavailable or black_listed :return: the list of pairs the user wants to trade without the one unavailable or black_listed
""" """
sanitized_whitelist = [] sanitized_whitelist = whitelist
health = exchange.get_wallet_health() health = exchange.get_wallet_health()
known_pairs = set()
for status in health: for status in health:
pair = '{}_{}'.format(_CONF['stake_currency'], status['Currency']) pair = '{}_{}'.format(_CONF['stake_currency'], status['Currency'])
known_pairs.add(pair)
if pair not in whitelist or pair in _CONF['exchange'].get('pair_blacklist', []): if pair not in whitelist or pair in _CONF['exchange'].get('pair_blacklist', []):
continue continue
if status['IsActive']: if not status['IsActive']:
sanitized_whitelist.append(pair) sanitized_whitelist.remove(pair)
else: else:
logger.info( logger.info(
'Ignoring %s from whitelist (reason: %s).', 'Ignoring %s from whitelist (reason: %s).',
pair, status.get('Notice') or 'wallet is not active' pair, status.get('Notice') or 'wallet is not active'
) )
return sanitized_whitelist
# We need to remove pairs that are unknown
final_list = [x for x in sanitized_whitelist if x in known_pairs]
return final_list
def _process(nb_assets: Optional[int] = 0) -> bool: def _process(nb_assets: Optional[int] = 0) -> bool:

12
freqtrade/tests/test_acl_pair.py
View File

@ -22,10 +22,12 @@ def whitelist_conf():
def get_health(): def get_health():
return [{'Currency': 'ETH', return [{'Currency': 'ETH',
'IsActive': True 'IsActive': True,
'BaseVolume' : 42
}, },
{'Currency': 'TKN', {'Currency': 'TKN',
'IsActive': True 'IsActive': True,
'BaseVolume' : 1664
}] }]
@ -44,7 +46,7 @@ def test_refresh_whitelist(mocker):
refreshedwhitelist = refresh_whitelist(conf['exchange']['pair_whitelist']) refreshedwhitelist = refresh_whitelist(conf['exchange']['pair_whitelist'])
whitelist = ['BTC_ETH', 'BTC_TKN'] whitelist = ['BTC_ETH', 'BTC_TKN']
# Ensure all except those in whitelist are removed # Ensure all except those in whitelist are removed
assert set(whitelist) == set(refreshedwhitelist) assert whitelist == refreshedwhitelist
def test_refresh_whitelist_dynamic(mocker): def test_refresh_whitelist_dynamic(mocker):
@ -53,9 +55,9 @@ def test_refresh_whitelist_dynamic(mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
get_wallet_health=get_health) get_wallet_health=get_health)
# argument: use the whitelist dynamically by exchange-volume # argument: use the whitelist dynamically by exchange-volume
whitelist = ['BTC_ETH', 'BTC_TKN'] whitelist = ['BTC_TKN', 'BTC_ETH']
refreshedwhitelist = refresh_whitelist(whitelist) refreshedwhitelist = refresh_whitelist(whitelist)
assert set(whitelist) == set(refreshedwhitelist) assert whitelist == refreshedwhitelist
def test_refresh_whitelist_dynamic_empty(mocker): def test_refresh_whitelist_dynamic_empty(mocker):