From 53b1f8d3a49709fe5d21aaaac4e719c5de049451 Mon Sep 17 00:00:00 2001 From: enenn Date: Sun, 15 Apr 2018 12:19:49 +0200 Subject: [PATCH] Add a 4th pair to testing dynamic whitelist generation --- freqtrade/tests/conftest.py | 44 ++++++++++++++++++++++++++++ freqtrade/tests/test_freqtradebot.py | 13 ++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index 5efeb1743..4a8e294b9 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -376,6 +376,28 @@ def tickers(): 'quoteVolume': 1515.14631229, 'info': {} }, + 'LTC/BTC': { + 'symbol': 'LTC/BTC', + 'timestamp': 1523787258992, + 'datetime': '2018-04-15T10:14:19.992Z', + 'high': 0.015978, + 'low': 0.0157, + 'bid': 0.015954, + 'bidVolume': 12.83, + 'ask': 0.015957, + 'askVolume': 0.49, + 'vwap': 0.01581636, + 'open': 0.015823, + 'close': 0.01582, + 'first': None, + 'last': 0.015951, + 'change': 0.809, + 'percentage': None, + 'average': None, + 'baseVolume': 88620.68, + 'quoteVolume': 1401.65697943, + 'info': {} + }, 'ETH/USDT': { 'symbol': 'ETH/USDT', 'timestamp': 1522014804118, @@ -441,6 +463,28 @@ def tickers(): 'baseVolume': 294106.204, 'quoteVolume': 19132399.743954, 'info': {} + }, + 'LTC/USDT': { + 'symbol': 'LTC/USDT', + 'timestamp': 1523787257812, + 'datetime': '2018-04-15T10:14:18.812Z', + 'high': 129.94, + 'low': 124.0, + 'bid': 129.28, + 'bidVolume': 0.03201, + 'ask': 129.52, + 'askVolume': 0.14529, + 'vwap': 126.92838682, + 'open': 127.0, + 'close': 127.1, + 'first': None, + 'last': 129.28, + 'change': 1.795, + 'percentage': None, + 'average': None, + 'baseVolume': 59698.79897, + 'quoteVolume': 29132399.743954, + 'info': {} } }) diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py index edacfb33f..76ceacc83 100644 --- a/freqtrade/tests/test_freqtradebot.py +++ b/freqtrade/tests/test_freqtradebot.py @@ -208,20 +208,21 @@ def test_gen_pair_whitelist(mocker, default_conf, tickers) -> None: freqtrade = get_patched_freqtradebot(mocker, default_conf) mocker.patch('freqtrade.freqtradebot.exchange.get_tickers', tickers) mocker.patch('freqtrade.freqtradebot.exchange.exchange_has', MagicMock(return_value=True)) + mocker.patch('freqtrade.exchange.validate_pairs', MagicMock(return_value=True)) - # Test to retrieved BTC sorted on BaseVolume + # Test to retrieved BTC sorted on quoteVolume (default) whitelist = freqtrade._gen_pair_whitelist(base_currency='BTC') - assert whitelist == ['ETH/BTC', 'TKN/BTC', 'BLK/BTC'] + assert whitelist == ['ETH/BTC', 'TKN/BTC', 'BLK/BTC', 'LTC/BTC'] # Test to retrieve BTC sorted on bidVolume whitelist = freqtrade._gen_pair_whitelist(base_currency='BTC', key='bidVolume') - assert whitelist == ['TKN/BTC', 'ETH/BTC', 'BLK/BTC'] + assert whitelist == ['LTC/BTC', 'TKN/BTC', 'ETH/BTC', 'BLK/BTC'] - # Test with USDT sorted on BaseVolume + # Test with USDT sorted on quoteVolume (default) whitelist = freqtrade._gen_pair_whitelist(base_currency='USDT') - assert whitelist == ['TKN/USDT', 'ETH/USDT', 'BLK/USDT'] + assert whitelist == ['TKN/USDT', 'ETH/USDT', 'LTC/USDT', 'BLK/USDT'] - # Test with ETH (our fixture does not have ETH, but Bittrex returns them) + # Test with ETH (our fixture does not have ETH, so result should be empty) whitelist = freqtrade._gen_pair_whitelist(base_currency='ETH') assert whitelist == []