return markets as dict

This commit is contained in:
iuvbio 2019-03-05 19:45:54 +01:00
parent 5c840f333f
commit c30fb7f590
1 changed files with 13 additions and 11 deletions

View File

@ -37,10 +37,12 @@ def log_has_re(line, logs):
def patch_exchange(mocker, api_mock=None, id='bittrex') -> None: def patch_exchange(mocker, api_mock=None, id='bittrex') -> None:
mocker.patch('freqtrade.exchange.Exchange._load_markets', MagicMock(return_value={})) mocker.patch('freqtrade.exchange.Exchange._load_markets', MagicMock(return_value={}))
mocker.patch('freqtrade.exchange.Exchange.validate_pairs', MagicMock())
mocker.patch('freqtrade.exchange.Exchange.validate_timeframes', MagicMock()) mocker.patch('freqtrade.exchange.Exchange.validate_timeframes', MagicMock())
mocker.patch('freqtrade.exchange.Exchange.validate_ordertypes', MagicMock()) mocker.patch('freqtrade.exchange.Exchange.validate_ordertypes', MagicMock())
mocker.patch('freqtrade.exchange.Exchange.id', PropertyMock(return_value=id)) mocker.patch('freqtrade.exchange.Exchange.id', PropertyMock(return_value=id))
mocker.patch('freqtrade.exchange.Exchange.name', PropertyMock(return_value=id.title())) mocker.patch('freqtrade.exchange.Exchange.name', PropertyMock(return_value=id.title()))
# mocker.patch('freqtrade.exchange.Exchange.markets', PropertyMock(return_value={}))
if api_mock: if api_mock:
mocker.patch('freqtrade.exchange.Exchange._init_ccxt', MagicMock(return_value=api_mock)) mocker.patch('freqtrade.exchange.Exchange._init_ccxt', MagicMock(return_value=api_mock))
@ -225,8 +227,8 @@ def ticker_sell_down():
@pytest.fixture @pytest.fixture
def markets(): def markets():
return MagicMock(return_value=[ return {
{ 'ETH/BTC': {
'id': 'ethbtc', 'id': 'ethbtc',
'symbol': 'ETH/BTC', 'symbol': 'ETH/BTC',
'base': 'ETH', 'base': 'ETH',
@ -251,7 +253,7 @@ def markets():
}, },
'info': '', 'info': '',
}, },
{ 'TKN/BTC': {
'id': 'tknbtc', 'id': 'tknbtc',
'symbol': 'TKN/BTC', 'symbol': 'TKN/BTC',
'base': 'TKN', 'base': 'TKN',
@ -276,7 +278,7 @@ def markets():
}, },
'info': '', 'info': '',
}, },
{ 'BLK/BTC': {
'id': 'blkbtc', 'id': 'blkbtc',
'symbol': 'BLK/BTC', 'symbol': 'BLK/BTC',
'base': 'BLK', 'base': 'BLK',
@ -301,7 +303,7 @@ def markets():
}, },
'info': '', 'info': '',
}, },
{ 'LTC/BTC': {
'id': 'ltcbtc', 'id': 'ltcbtc',
'symbol': 'LTC/BTC', 'symbol': 'LTC/BTC',
'base': 'LTC', 'base': 'LTC',
@ -326,7 +328,7 @@ def markets():
}, },
'info': '', 'info': '',
}, },
{ 'XRP/BTC': {
'id': 'xrpbtc', 'id': 'xrpbtc',
'symbol': 'XRP/BTC', 'symbol': 'XRP/BTC',
'base': 'XRP', 'base': 'XRP',
@ -351,7 +353,7 @@ def markets():
}, },
'info': '', 'info': '',
}, },
{ 'NEO/BTC': {
'id': 'neobtc', 'id': 'neobtc',
'symbol': 'NEO/BTC', 'symbol': 'NEO/BTC',
'base': 'NEO', 'base': 'NEO',
@ -376,7 +378,7 @@ def markets():
}, },
'info': '', 'info': '',
}, },
{ 'BTT/BTC': {
'id': 'BTTBTC', 'id': 'BTTBTC',
'symbol': 'BTT/BTC', 'symbol': 'BTT/BTC',
'base': 'BTT', 'base': 'BTT',
@ -404,7 +406,7 @@ def markets():
}, },
'info': "", 'info': "",
}, },
{ 'ETH/USDT': {
'id': 'USDT-ETH', 'id': 'USDT-ETH',
'symbol': 'ETH/USDT', 'symbol': 'ETH/USDT',
'base': 'ETH', 'base': 'ETH',
@ -426,7 +428,7 @@ def markets():
'active': True, 'active': True,
'info': "" 'info': ""
}, },
{ 'LTC/USDT': {
'id': 'USDT-LTC', 'id': 'USDT-LTC',
'symbol': 'LTC/USDT', 'symbol': 'LTC/USDT',
'base': 'LTC', 'base': 'LTC',
@ -448,7 +450,7 @@ def markets():
}, },
'info': "" 'info': ""
} }
]) }
@pytest.fixture @pytest.fixture