adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

list-available-pairs should be tradingmode dependent

Browse Source
This commit is contained in:
Matthias 2021-12-03 08:09:32 +01:00
parent b578e31255
commit e0e4369c8e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freqtrade/rpc/api_server/api_v1.py
View File

@ -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)) 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'],
pair_interval = dh.ohlcv_get_available_data(config['datadir'], 'spot') config.get('trading_mode', 'spot'))
if timeframe: if timeframe:
pair_interval = [pair for pair in pair_interval if pair[1] == timeframe] pair_interval = [pair for pair in pair_interval if pair[1] == timeframe]

7
tests/rpc/test_rpc_apiserver.py
View File

@ -1353,6 +1353,13 @@ def test_list_available_pairs(botclient):
assert rc.json()['pairs'] == ['XRP/ETH'] assert rc.json()['pairs'] == ['XRP/ETH']
assert len(rc.json()['pair_interval']) == 1 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( rc = client_get(
client, f"{BASE_URI}/available_pairs?timeframe=1h&candletype=mark") client, f"{BASE_URI}/available_pairs?timeframe=1h&candletype=mark")
assert_response(rc) assert_response(rc)