Refactored by Sourcery

This commit is contained in:
Sourcery AI 2020-05-14 04:47:11 +00:00
parent d957f3dd2d
commit b974e8fddf

View File

@ -946,8 +946,14 @@ class FreqtradeBot:
:return: Reason for cancel :return: Reason for cancel
""" """
# if trade is not partially completed, just cancel the trade # if trade is not partially completed, just cancel the trade
if order['remaining'] == order['amount'] or order.get('filled') == 0.0: if not (
if not self.exchange.check_order_canceled_empty(order): order['remaining'] == order['amount'] or order.get('filled') == 0.0
):
# TODO: figure out how to handle partially complete sell orders
return 'partially filled - keeping order open'
if self.exchange.check_order_canceled_empty(order):
reason = "cancelled on exchange"
else:
reason = "cancelled due to timeout" reason = "cancelled due to timeout"
try: try:
# if trade is not partially completed, just delete the trade # if trade is not partially completed, just delete the trade
@ -956,10 +962,6 @@ class FreqtradeBot:
logger.exception(f"Could not cancel sell order {trade.open_order_id}") logger.exception(f"Could not cancel sell order {trade.open_order_id}")
return 'error cancelling order' return 'error cancelling order'
logger.info('Sell order %s for %s.', reason, trade) logger.info('Sell order %s for %s.', reason, trade)
else:
reason = "cancelled on exchange"
logger.info('Sell order %s for %s.', reason, trade)
trade.close_rate = None trade.close_rate = None
trade.close_rate_requested = None trade.close_rate_requested = None
trade.close_profit = None trade.close_profit = None
@ -970,9 +972,6 @@ class FreqtradeBot:
return reason return reason
# TODO: figure out how to handle partially complete sell orders
return 'partially filled - keeping order open'
def _safe_sell_amount(self, pair: str, amount: float) -> float: def _safe_sell_amount(self, pair: str, amount: float) -> float:
""" """
Get sellable amount. Get sellable amount.