diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 94a159b47..6e679d64d 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -1698,7 +1698,6 @@ class FreqtradeBot(LoggingMixin): order_obj = Order.parse_from_ccxt_object(order, trade.pair, trade.exit_side, amount, limit) trade.orders.append(order_obj) - # trade.open_order_id = order['id'] trade.exit_order_status = '' trade.close_rate_requested = limit trade.exit_reason = exit_reason diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py index 5ce0c6ec4..b9e7adebb 100644 --- a/tests/rpc/test_rpc.py +++ b/tests/rpc/test_rpc.py @@ -1096,7 +1096,7 @@ def test_rpc_force_entry(mocker, default_conf, ticker, fee, limit_buy_order_open trade = rpc._rpc_force_entry(pair, 0.0001, order_type='limit', stake_amount=0.05) assert trade.stake_amount == 0.05 assert trade.buy_tag == 'force_entry' - # assert trade.open_order_id == 'mocked_limit_buy' + assert trade.open_orders_ids[-1] == 'mocked_limit_buy' freqtradebot.strategy.position_adjustment_enable = True diff --git a/tests/test_integration.py b/tests/test_integration.py index 4ccde0d31..2d79fbaac 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -103,7 +103,6 @@ def test_may_execute_exit_stoploss_on_exchange_multi(default_conf, ticker, fee, trade.orders.append(oobj) trade.stoploss_order_id = f"stop{idx}" - trade.open_order_id = None n = freqtrade.exit_positions(trades) assert n == 2 @@ -194,8 +193,7 @@ def test_forcebuy_last_unlimited(default_conf, ticker, fee, mocker, balance_rati for trade in trades: assert pytest.approx(trade.stake_amount) == result1 - # Reset trade open order id's - trade.open_order_id = None + trades = Trade.get_open_trades() assert len(trades) == 5 bals = freqtrade.wallets.get_all_balances()