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

fixing flake8 code review

Browse Source
This commit is contained in:
Jean-Baptiste LE STANG 2017-12-29 22:53:54 +01:00
parent 76536af552
commit 3d59abf93e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/main.py
View File

@ -36,7 +36,7 @@ def refresh_whitelist(whitelist: List[str]) -> List[str]:
health = exchange.get_wallet_health() health = exchange.get_wallet_health()
for status in health: for status in health:
pair = '{}_{}'.format(_CONF['stake_currency'], status['Currency']) pair = '{}_{}'.format(_CONF['stake_currency'], status['Currency'])
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 status['IsActive']:
sanitized_whitelist.append(pair) sanitized_whitelist.append(pair)
@ -47,6 +47,7 @@ def refresh_whitelist(whitelist: List[str]) -> List[str]:
) )
return sanitized_whitelist return sanitized_whitelist
def _process(nb_assets: Optional[int] = 0) -> bool: def _process(nb_assets: Optional[int] = 0) -> bool:
""" """
Queries the persistence layer for open trades and handles them, Queries the persistence layer for open trades and handles them,
@ -64,7 +65,8 @@ def _process(nb_assets: Optional[int] = 0) -> bool:
) )
# Keep only the subsets of pairs wanted (up to nb_assets) # Keep only the subsets of pairs wanted (up to nb_assets)
_CONF['exchange']['pair_whitelist'] = sanitized_list[:nb_assets] if nb_assets else sanitized_list final_list = sanitized_list[:nb_assets] if nb_assets else sanitized_list
_CONF['exchange']['pair_whitelist'] = final_list
# Query trades from persistence layer # Query trades from persistence layer
trades = Trade.query.filter(Trade.is_open.is_(True)).all() trades = Trade.query.filter(Trade.is_open.is_(True)).all()

1
freqtrade/tests/test_acl_pair.py
View File

@ -52,7 +52,6 @@ def test_refresh_whitelist(mocker):
print(conf['exchange']['pair_whitelist']) print(conf['exchange']['pair_whitelist'])
print(refreshedwhitelist) print(refreshedwhitelist)
whitelist = ['BTC_ETH', 'BTC_TKN'] whitelist = ['BTC_ETH', 'BTC_TKN']
pairslist = conf['exchange']['pair_whitelist']
# Ensure all except those in whitelist are removed # Ensure all except those in whitelist are removed
assert_list_equal(whitelist, refreshedwhitelist) assert_list_equal(whitelist, refreshedwhitelist)

1
freqtrade/tests/test_main.py
View File

@ -179,6 +179,7 @@ def test_create_trade_no_pairs(default_conf, ticker, mocker):
mocker.patch.dict('freqtrade.main._CONF', conf) mocker.patch.dict('freqtrade.main._CONF', conf)
create_trade(default_conf['stake_amount']) create_trade(default_conf['stake_amount'])
def test_create_trade_no_pairs_after_blacklist(default_conf, ticker, mocker): def test_create_trade_no_pairs_after_blacklist(default_conf, ticker, mocker):
mocker.patch.dict('freqtrade.main._CONF', default_conf) mocker.patch.dict('freqtrade.main._CONF', default_conf)
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True) mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True)