Add volumePairList - refactor tests to correct file

freqtrade/tests/test_acl_pair.py

@@ -2,6 +2,7 @@
 
 from unittest.mock import MagicMock
 
+from freqtrade import OperationalException
 from freqtrade.tests.conftest import get_patched_freqtradebot
 
 import pytest
@@ -35,7 +36,7 @@ def test_refresh_market_pair_not_in_whitelist(mocker, markets, whitelist_conf):
     # List ordered by BaseVolume
     whitelist = ['ETH/BTC', 'TKN/BTC']
     # Ensure all except those in whitelist are removed
-    assert whitelist == freqtradebot.pairlists.whitelist
+    assert set(whitelist) == set(freqtradebot.pairlists.whitelist)
     # Ensure config dict hasn't been changed
     assert (whitelist_conf['exchange']['pair_whitelist'] ==
             freqtradebot.config['exchange']['pair_whitelist'])
@@ -49,11 +50,12 @@ def test_refresh_pairlists(mocker, markets, whitelist_conf):
     # List ordered by BaseVolume
     whitelist = ['ETH/BTC', 'TKN/BTC']
     # Ensure all except those in whitelist are removed
-    assert whitelist == freqtradebot.pairlists.whitelist
+    assert set(whitelist)== set(freqtradebot.pairlists.whitelist)
     assert whitelist_conf['exchange']['pair_blacklist'] == freqtradebot.pairlists.blacklist
 
 
 def test_refresh_whitelist_dynamic(mocker, markets, tickers, whitelist_conf):
+    whitelist_conf['dynamic_whitelist'] = 5
     freqtradebot = get_patched_freqtradebot(mocker, whitelist_conf)
     mocker.patch.multiple(
         'freqtrade.exchange.Exchange',
@@ -64,10 +66,7 @@ def test_refresh_whitelist_dynamic(mocker, markets, tickers, whitelist_conf):
 
     # argument: use the whitelist dynamically by exchange-volume
     whitelist = ['ETH/BTC', 'TKN/BTC']
-
-    freqtradebot._refresh_whitelist(
-        freqtradebot._gen_pair_whitelist(whitelist_conf['stake_currency'])
-    )
+    freqtradebot.pairlists.refresh_whitelist()
 
     assert whitelist == freqtradebot.pairlists.whitelist
 
@@ -79,7 +78,40 @@ def test_refresh_whitelist_dynamic_empty(mocker, markets_empty, whitelist_conf):
     # argument: use the whitelist dynamically by exchange-volume
     whitelist = []
     whitelist_conf['exchange']['pair_whitelist'] = []
-    freqtradebot._refresh_whitelist(whitelist)
+    freqtradebot.pairlists.refresh_whitelist()
     pairslist = whitelist_conf['exchange']['pair_whitelist']
 
     assert set(whitelist) == set(pairslist)
+
+
+def test_gen_pair_whitelist(mocker, default_conf, tickers) -> None:
+    freqtrade = get_patched_freqtradebot(mocker, default_conf)
+    mocker.patch('freqtrade.exchange.Exchange.get_tickers', tickers)
+    mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
+
+    # Test to retrieved BTC sorted on quoteVolume (default)
+    freqtrade.pairlists.refresh_whitelist()
+
+    whitelist = freqtrade.pairlists.whitelist
+    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 == ['LTC/BTC', 'TKN/BTC', 'ETH/BTC', 'BLK/BTC']
+
+    # Test with USDT sorted on quoteVolume (default)
+    whitelist = freqtrade._gen_pair_whitelist(base_currency='USDT')
+    assert whitelist == ['TKN/USDT', 'ETH/USDT', 'LTC/USDT', 'BLK/USDT']
+
+    # Test with ETH (our fixture does not have ETH, so result should be empty)
+    whitelist = freqtrade._gen_pair_whitelist(base_currency='ETH')
+    assert whitelist == []
+
+
+def test_gen_pair_whitelist_not_supported(mocker, default_conf, tickers) -> None:
+    freqtrade = get_patched_freqtradebot(mocker, default_conf)
+    mocker.patch('freqtrade.exchange.Exchange.get_tickers', tickers)
+    mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=False))
+
+    with pytest.raises(OperationalException):
+        freqtrade._gen_pair_whitelist(base_currency='BTC')

freqtrade/tests/test_freqtradebot.py

@@ -136,37 +136,6 @@ def test_throttle_with_assets(mocker, default_conf) -> None:
     assert result == -1
 
 
-def test_gen_pair_whitelist(mocker, default_conf, tickers) -> None:
-    freqtrade = get_patched_freqtradebot(mocker, default_conf)
-    mocker.patch('freqtrade.exchange.Exchange.get_tickers', tickers)
-    mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
-
-    # Test to retrieved BTC sorted on quoteVolume (default)
-    whitelist = freqtrade._gen_pair_whitelist(base_currency='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 == ['LTC/BTC', 'TKN/BTC', 'ETH/BTC', 'BLK/BTC']
-
-    # Test with USDT sorted on quoteVolume (default)
-    whitelist = freqtrade._gen_pair_whitelist(base_currency='USDT')
-    assert whitelist == ['TKN/USDT', 'ETH/USDT', 'LTC/USDT', 'BLK/USDT']
-
-    # Test with ETH (our fixture does not have ETH, so result should be empty)
-    whitelist = freqtrade._gen_pair_whitelist(base_currency='ETH')
-    assert whitelist == []
-
-
-def test_gen_pair_whitelist_not_supported(mocker, default_conf, tickers) -> None:
-    freqtrade = get_patched_freqtradebot(mocker, default_conf)
-    mocker.patch('freqtrade.exchange.Exchange.get_tickers', tickers)
-    mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=False))
-
-    with pytest.raises(OperationalException):
-        freqtrade._gen_pair_whitelist(base_currency='BTC')
-
-
 def test_get_trade_stake_amount(default_conf, ticker, limit_buy_order, fee, mocker) -> None:
     patch_RPCManager(mocker)
     patch_exchange(mocker)