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

Use filled, it's the safer choice when determining the filled amount.

Browse Source
This commit is contained in:
Matthias 2020-05-05 07:08:24 +02:00
parent b4aeb93a18
commit 981976681a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/freqtradebot.py
View File

@ -898,7 +898,7 @@ class FreqtradeBot:
Buy timeout - cancel order Buy timeout - cancel order
:return: True if order was fully cancelled :return: True if order was fully cancelled
""" """
if order['status'] != 'canceled': if order['status'] not in ('canceled', 'closed'):
reason = "cancelled due to timeout" reason = "cancelled due to timeout"
corder = self.exchange.cancel_order_with_result(trade.open_order_id, trade.pair, corder = self.exchange.cancel_order_with_result(trade.open_order_id, trade.pair,
trade.amount) trade.amount)
@ -909,7 +909,7 @@ class FreqtradeBot:
logger.info('Buy order %s for %s.', reason, trade) logger.info('Buy order %s for %s.', reason, trade)
if safe_value_fallback(corder, order, 'remaining', 'remaining') == order['amount']: if safe_value_fallback(corder, order, 'filled', 'filled') == 0.0:
logger.info('Buy order fully cancelled. Removing %s from database.', trade) logger.info('Buy order fully cancelled. Removing %s from database.', trade)
# if trade is not partially completed, just delete the trade # if trade is not partially completed, just delete the trade
Trade.session.delete(trade) Trade.session.delete(trade)
@ -921,8 +921,7 @@ class FreqtradeBot:
# cancel_order may not contain the full order dict, so we need to fallback # cancel_order may not contain the full order dict, so we need to fallback
# to the order dict aquired before cancelling. # to the order dict aquired before cancelling.
# we need to fall back to the values from order if corder does not contain these keys. # we need to fall back to the values from order if corder does not contain these keys.
trade.amount = order['amount'] - safe_value_fallback(corder, order, trade.amount = safe_value_fallback(corder, order, 'filled', 'filled')
'remaining', 'remaining')
trade.stake_amount = trade.amount * trade.open_rate trade.stake_amount = trade.amount * trade.open_rate
self.update_trade_state(trade, corder, trade.amount) self.update_trade_state(trade, corder, trade.amount)

1
tests/test_freqtradebot.py
View File

@ -2346,7 +2346,6 @@ def test_handle_timedout_limit_buy_exchanges(mocker, caplog, default_conf,
assert log_has_re(r'Buy order fully cancelled. Removing .* from database\.', caplog) assert log_has_re(r'Buy order fully cancelled. Removing .* from database\.', caplog)
@pytest.mark.parametrize('cancelorder', [ @pytest.mark.parametrize('cancelorder', [
{}, {},
{'remaining': None}, {'remaining': None},