Fix tests in acl_pair

This commit is contained in:
Matthias Voppichler 2018-03-24 20:42:51 +01:00
parent 82a2144296
commit 32222ae6ef

View File

@ -12,77 +12,87 @@ def whitelist_conf():
config['stake_currency'] = 'BTC' config['stake_currency'] = 'BTC'
config['exchange']['pair_whitelist'] = [ config['exchange']['pair_whitelist'] = [
'BTC_ETH', 'ETH/BTC',
'BTC_TKN', 'TKN/BTC',
'BTC_TRST', 'TRST/BTC',
'BTC_SWT', 'SWT/BTC',
'BTC_BCC' 'BCC/BTC'
] ]
config['exchange']['pair_blacklist'] = [ config['exchange']['pair_blacklist'] = [
'BTC_BLK' 'BLK/BTC'
] ]
return config return config
def get_market_summaries(): def get_market_summaries():
return [{ return {
'MarketName': 'BTC-TKN', 'TKN/BTC': {
'High': 0.00000919, 'symbol': 'TKN/BTC',
'Low': 0.00000820, 'info': {
'Volume': 74339.61396015, 'High': 0.00000919,
'Last': 0.00000820, 'Low': 0.00000820,
'BaseVolume': 1664, 'Volume': 74339.61396015,
'TimeStamp': '2014-07-09T07:19:30.15', 'Last': 0.00000820,
'Bid': 0.00000820, 'BaseVolume': 1664,
'Ask': 0.00000831, 'TimeStamp': '2014-07-09T07:19:30.15',
'OpenBuyOrders': 15, 'Bid': 0.00000820,
'OpenSellOrders': 15, 'Ask': 0.00000831,
'PrevDay': 0.00000821, 'OpenBuyOrders': 15,
'Created': '2014-03-20T06:00:00', 'OpenSellOrders': 15,
'DisplayMarketName': '' 'PrevDay': 0.00000821,
}, { 'Created': '2014-03-20T06:00:00',
'MarketName': 'BTC-ETH', 'DisplayMarketName': ''
'High': 0.00000072, }
'Low': 0.00000001, },
'Volume': 166340678.42280999, 'ETH/BTC': {
'Last': 0.00000005, 'symbol': 'ETH/BTC',
'BaseVolume': 42, 'info': {
'TimeStamp': '2014-07-09T07:21:40.51', 'High': 0.00000072,
'Bid': 0.00000004, 'Low': 0.00000001,
'Ask': 0.00000005, 'Volume': 166340678.42280999,
'OpenBuyOrders': 18, 'Last': 0.00000005,
'OpenSellOrders': 18, 'BaseVolume': 42,
'PrevDay': 0.00000002, 'TimeStamp': '2014-07-09T07:21:40.51',
'Created': '2014-05-30T07:57:49.637', 'Bid': 0.00000004,
'DisplayMarketName': '' 'Ask': 0.00000005,
}, { 'OpenBuyOrders': 18,
'MarketName': 'BTC-BLK', 'OpenSellOrders': 18,
'High': 0.00000072, 'PrevDay': 0.00000002,
'Low': 0.00000001, 'Created': '2014-05-30T07:57:49.637',
'Volume': 166340678.42280999, 'DisplayMarketName': ''
'Last': 0.00000005, }
'BaseVolume': 3, },
'TimeStamp': '2014-07-09T07:21:40.51', 'BLK/BTC': {
'Bid': 0.00000004, 'symbol': 'BLK/BTC',
'Ask': 0.00000005, 'info': {
'OpenBuyOrders': 18, 'High': 0.00000072,
'OpenSellOrders': 18, 'Low': 0.00000001,
'PrevDay': 0.00000002, 'Volume': 166340678.42280999,
'Created': '2014-05-30T07:57:49.637', 'Last': 0.00000005,
'DisplayMarketName': '' 'BaseVolume': 3,
}] 'TimeStamp': '2014-07-09T07:21:40.51',
'Bid': 0.00000004,
'Ask': 0.00000005,
'OpenBuyOrders': 18,
'OpenSellOrders': 18,
'PrevDay': 0.00000002,
'Created': '2014-05-30T07:57:49.637',
'DisplayMarketName': ''
}}
}
def get_health(): def get_health():
return [{'Currency': 'ETH', 'IsActive': True}, return {
{'Currency': 'TKN', 'IsActive': True}, 'ETH/BTC': {'base': 'ETH', 'active': True},
{'Currency': 'BLK', 'IsActive': True}] 'TKN/BTC': {'base': 'TKN', 'active': True},
'BLK/BTC': {'base': 'BLK', 'active': True}}
def get_health_empty(): def get_health_empty():
return [] return {}
def test_refresh_market_pair_not_in_whitelist(mocker): def test_refresh_market_pair_not_in_whitelist(mocker):
@ -92,10 +102,10 @@ def test_refresh_market_pair_not_in_whitelist(mocker):
mocker.patch('freqtrade.freqtradebot.exchange.get_wallet_health', get_health) mocker.patch('freqtrade.freqtradebot.exchange.get_wallet_health', get_health)
refreshedwhitelist = freqtradebot._refresh_whitelist( refreshedwhitelist = freqtradebot._refresh_whitelist(
conf['exchange']['pair_whitelist'] + ['BTC_XXX'] conf['exchange']['pair_whitelist'] + ['XXX/BTC']
) )
# List ordered by BaseVolume # List ordered by BaseVolume
whitelist = ['BTC_ETH', 'BTC_TKN'] whitelist = ['ETH/BTC', 'TKN/BTC']
# Ensure all except those in whitelist are removed # Ensure all except those in whitelist are removed
assert whitelist == refreshedwhitelist assert whitelist == refreshedwhitelist
@ -108,7 +118,7 @@ def test_refresh_whitelist(mocker):
refreshedwhitelist = freqtradebot._refresh_whitelist(conf['exchange']['pair_whitelist']) refreshedwhitelist = freqtradebot._refresh_whitelist(conf['exchange']['pair_whitelist'])
# List ordered by BaseVolume # List ordered by BaseVolume
whitelist = ['BTC_ETH', 'BTC_TKN'] whitelist = ['ETH/BTC', 'TKN/BTC']
# Ensure all except those in whitelist are removed # Ensure all except those in whitelist are removed
assert whitelist == refreshedwhitelist assert whitelist == refreshedwhitelist
@ -123,7 +133,7 @@ def test_refresh_whitelist_dynamic(mocker):
) )
# argument: use the whitelist dynamically by exchange-volume # argument: use the whitelist dynamically by exchange-volume
whitelist = ['BTC_TKN', 'BTC_ETH'] whitelist = ['TKN/BTC', 'ETH/BTC']
refreshedwhitelist = freqtradebot._refresh_whitelist( refreshedwhitelist = freqtradebot._refresh_whitelist(
freqtradebot._gen_pair_whitelist(conf['stake_currency']) freqtradebot._gen_pair_whitelist(conf['stake_currency'])