From e0e4369c8eb28a2ca7973c9ef95c6c05cf8f717a Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 3 Dec 2021 08:09:32 +0100 Subject: [PATCH] list-available-pairs should be tradingmode dependent --- freqtrade/rpc/api_server/api_v1.py | 4 ++-- tests/rpc/test_rpc_apiserver.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/freqtrade/rpc/api_server/api_v1.py b/freqtrade/rpc/api_server/api_v1.py index f97d49e96..f69ddef43 100644 --- a/freqtrade/rpc/api_server/api_v1.py +++ b/freqtrade/rpc/api_server/api_v1.py @@ -254,8 +254,8 @@ def list_available_pairs(timeframe: Optional[str] = None, stake_currency: Option dh = get_datahandler(config['datadir'], config.get('dataformat_ohlcv', None)) - # TODO-lev: xmatt to decide: use candle-type or market mode for this endpoint?? - pair_interval = dh.ohlcv_get_available_data(config['datadir'], 'spot') + pair_interval = dh.ohlcv_get_available_data(config['datadir'], + config.get('trading_mode', 'spot')) if timeframe: pair_interval = [pair for pair in pair_interval if pair[1] == timeframe] diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index 75455982e..bb540dc94 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -1353,6 +1353,13 @@ def test_list_available_pairs(botclient): assert rc.json()['pairs'] == ['XRP/ETH'] assert len(rc.json()['pair_interval']) == 1 + ftbot.config['trading_mode'] = 'futures' + rc = client_get( + client, f"{BASE_URI}/available_pairs?timeframe=1h") + assert_response(rc) + assert rc.json()['length'] == 1 + assert rc.json()['pairs'] == ['XRP/USDT'] + rc = client_get( client, f"{BASE_URI}/available_pairs?timeframe=1h&candletype=mark") assert_response(rc)