Fix small merge errors
This commit is contained in:
parent
0622654bcf
commit
7435b5ec96
@ -116,7 +116,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
|
|||||||
'is_short': False,
|
'is_short': False,
|
||||||
'funding_fees': 0.0,
|
'funding_fees': 0.0,
|
||||||
'trading_mode': TradingMode.SPOT,
|
'trading_mode': TradingMode.SPOT,
|
||||||
# 'filled_entery_orders': [{
|
|
||||||
'orders': [{
|
'orders': [{
|
||||||
'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05,
|
'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05,
|
||||||
'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',
|
'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',
|
||||||
@ -125,7 +124,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
|
|||||||
'is_open': False, 'pair': 'ETH/BTC', 'order_id': ANY,
|
'is_open': False, 'pair': 'ETH/BTC', 'order_id': ANY,
|
||||||
'remaining': ANY, 'status': ANY
|
'remaining': ANY, 'status': ANY
|
||||||
}],
|
}],
|
||||||
# 'filled_exit_orders': [],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mocker.patch('freqtrade.exchange.Exchange.get_rate',
|
mocker.patch('freqtrade.exchange.Exchange.get_rate',
|
||||||
@ -200,7 +198,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
|
|||||||
'is_short': False,
|
'is_short': False,
|
||||||
'funding_fees': 0.0,
|
'funding_fees': 0.0,
|
||||||
'trading_mode': TradingMode.SPOT,
|
'trading_mode': TradingMode.SPOT,
|
||||||
# 'filled_entry_orders': [{
|
|
||||||
'orders': [{
|
'orders': [{
|
||||||
'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05,
|
'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05,
|
||||||
'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',
|
'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',
|
||||||
@ -208,7 +205,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
|
|||||||
'order_filled_timestamp': ANY, 'order_type': 'limit', 'price': 1.098e-05,
|
'order_filled_timestamp': ANY, 'order_type': 'limit', 'price': 1.098e-05,
|
||||||
'is_open': False, 'pair': 'ETH/BTC', 'order_id': ANY,
|
'is_open': False, 'pair': 'ETH/BTC', 'order_id': ANY,
|
||||||
'remaining': ANY, 'status': ANY}],
|
'remaining': ANY, 'status': ANY}],
|
||||||
# 'filled_exit_orders': [],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1608,8 +1608,6 @@ def test_to_json(default_conf, fee):
|
|||||||
'is_short': None,
|
'is_short': None,
|
||||||
'trading_mode': None,
|
'trading_mode': None,
|
||||||
'funding_fees': None,
|
'funding_fees': None,
|
||||||
'filled_entry_orders': [],
|
|
||||||
'filled_exit_orders': [],
|
|
||||||
'orders': [],
|
'orders': [],
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1685,8 +1683,6 @@ def test_to_json(default_conf, fee):
|
|||||||
'is_short': None,
|
'is_short': None,
|
||||||
'trading_mode': None,
|
'trading_mode': None,
|
||||||
'funding_fees': None,
|
'funding_fees': None,
|
||||||
'filled_entry_orders': [],
|
|
||||||
'filled_exit_orders': [],
|
|
||||||
'orders': [],
|
'orders': [],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user