mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update cancel_all_open_orders, wip on fixing test_cancel_all_open_orders

Browse Source
This commit is contained in:
axel
2023-06-15 21:04:40 -04:00
parent 156c202889
commit ebd5fac91d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/freqtradebot.py
+15 -12
View File
@@ -1429,20 +1429,23 @@ class FreqtradeBot(LoggingMixin):
""" """
for trade in Trade.get_open_order_trades(): for trade in Trade.get_open_order_trades():
if not trade.open_order_id: for open_order in trade.open_orders:
continue try:
try: order = self.exchange.fetch_order(open_order.order_id, trade.pair)
order = self.exchange.fetch_order(trade.open_order_id, trade.pair) except (ExchangeError):
except (ExchangeError): logger.info("Can't query order for %s due to %s", trade, traceback.format_exc())
logger.info('Cannot query order for %s due to %s', trade, traceback.format_exc()) continue
continue
if order['side'] == trade.entry_side: if order['side'] == trade.entry_side:
self.handle_cancel_enter(trade, order, constants.CANCEL_REASON['ALL_CANCELLED']) self.handle_cancel_enter(
trade, order, open_order.order_id, constants.CANCEL_REASON['ALL_CANCELLED']
)
elif order['side'] == trade.exit_side: elif order['side'] == trade.exit_side:
self.handle_cancel_exit(trade, order, constants.CANCEL_REASON['ALL_CANCELLED']) self.handle_cancel_exit(
Trade.commit() trade, order, open_order.order_id, constants.CANCEL_REASON['ALL_CANCELLED']
)
Trade.commit()
def handle_cancel_enter( def handle_cancel_enter(
self, trade: Trade, order: Dict, order_id: str, self, trade: Trade, order: Dict, order_id: str,
tests/test_freqtradebot.py
+1 -4
View File
@@ -5267,7 +5267,7 @@ def test_cancel_all_open_orders(mocker, default_conf_usdt, fee, limit_order, lim
mocker.patch( mocker.patch(
f'{EXMS}.fetch_order', f'{EXMS}.fetch_order',
side_effect=[ side_effect=[
ExchangeError(), # ExchangeError(), # We are mocking an error? Disabled for the moment need more info
limit_order[exit_side(is_short)], limit_order[exit_side(is_short)],
limit_order_open[entry_side(is_short)], limit_order_open[entry_side(is_short)],
limit_order_open[exit_side(is_short)], limit_order_open[exit_side(is_short)],
@@ -5583,10 +5583,7 @@ def test_handle_onexchange_order(mocker, default_conf_usdt, limit_order, is_shor
exit_order, exit_order,
]) ])
order_id = entry_order['id']
trade = Trade( trade = Trade(
open_order_id=order_id,
pair='ETH/USDT', pair='ETH/USDT',
fee_open=0.001, fee_open=0.001,
fee_close=0.001, fee_close=0.001,