From 9d9319bec555e1058997440c634c680a7396d87e Mon Sep 17 00:00:00 2001 From: Ramon Bastiaans Date: Fri, 2 Feb 2018 00:34:57 +0100 Subject: [PATCH] Resolve merge conflict --- freqtrade/rpc/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/freqtrade/rpc/__init__.py b/freqtrade/rpc/__init__.py index 163e0a8aa..b0a023df6 100644 --- a/freqtrade/rpc/__init__.py +++ b/freqtrade/rpc/__init__.py @@ -84,7 +84,7 @@ def rpc_trade_status(): for trade in trades: order = None if trade.open_order_id: - order = exchange.get_order(trade.open_order_id) + order = exchange.get_order(trade.open_order_id, trade.pair) # calculate profit and send message to user current_rate = exchange.get_ticker(trade.pair, False)['bid'] current_profit = trade.calc_profit_percent(current_rate) @@ -340,11 +340,11 @@ def rpc_forcesell(trade_id) -> None: def _exec_forcesell(trade: Trade) -> str: # Check if there is there is an open order if trade.open_order_id: - order = exchange.get_order(trade.open_order_id) + order = exchange.get_order(trade.open_order_id, trade.pair) # Cancel open LIMIT_BUY orders and close trade if order and not order['closed'] and order['type'] == 'LIMIT_BUY': - exchange.cancel_order(trade.open_order_id) + exchange.cancel_order(trade.open_order_id, trade.pair) trade.close(order.get('rate') or trade.open_rate) # TODO: sell amount which has been bought already return