Merge remote-tracking branch 'origin/develop' into feat/freqai-rl-dev
This commit is contained in:
@@ -45,16 +45,16 @@ EXCHANGES = {
|
||||
'leverage_tiers_public': False,
|
||||
'leverage_in_spot_market': True,
|
||||
},
|
||||
'ftx': {
|
||||
'pair': 'BTC/USD',
|
||||
'stake_currency': 'USD',
|
||||
'hasQuoteVolume': True,
|
||||
'timeframe': '5m',
|
||||
'futures_pair': 'BTC/USD:USD',
|
||||
'futures': False,
|
||||
'leverage_tiers_public': False, # TODO: Set to True once implemented on CCXT
|
||||
'leverage_in_spot_market': True,
|
||||
},
|
||||
# 'ftx': {
|
||||
# 'pair': 'BTC/USD',
|
||||
# 'stake_currency': 'USD',
|
||||
# 'hasQuoteVolume': True,
|
||||
# 'timeframe': '5m',
|
||||
# 'futures_pair': 'BTC/USD:USD',
|
||||
# 'futures': False,
|
||||
# 'leverage_tiers_public': False, # TODO: Set to True once implemented on CCXT
|
||||
# 'leverage_in_spot_market': True,
|
||||
# },
|
||||
'kucoin': {
|
||||
'pair': 'XRP/USDT',
|
||||
'stake_currency': 'USDT',
|
||||
|
@@ -2197,15 +2197,16 @@ def test_get_trades__query(fee, is_short):
|
||||
# without orders there should be no join issued.
|
||||
query1 = Trade.get_trades([], include_orders=False)
|
||||
|
||||
assert "JOIN orders" in str(query)
|
||||
assert "JOIN orders" not in str(query1)
|
||||
# Empty "with-options -> default - selectin"
|
||||
assert query._with_options == ()
|
||||
assert query1._with_options != ()
|
||||
|
||||
create_mock_trades(fee, is_short)
|
||||
query = Trade.get_trades([])
|
||||
query1 = Trade.get_trades([], include_orders=False)
|
||||
|
||||
assert "JOIN orders" in str(query)
|
||||
assert "JOIN orders" not in str(query1)
|
||||
assert query._with_options == ()
|
||||
assert query1._with_options != ()
|
||||
|
||||
|
||||
def test_get_trades_backtest():
|
||||
|
Reference in New Issue
Block a user