diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 0cb84e3f4..5844eb31e 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -863,7 +863,6 @@ class FreqtradeBot(LoggingMixin): exit_tag = None exit_signal_type = "exit_short" if trade.is_short else "exit_long" - # TODO-lev: change to use_exit_signal, ignore_roi_if_enter_signal if (self.config.get('use_exit_signal', True) or self.config.get('ignore_roi_if_enter_signal', False)): analyzed_df, _ = self.dataprovider.get_analyzed_dataframe(trade.pair, @@ -946,7 +945,6 @@ class FreqtradeBot(LoggingMixin): # We check if stoploss order is fulfilled if stoploss_order and stoploss_order['status'] in ('closed', 'triggered'): - # TODO-lev: Update to exit reason trade.exit_reason = ExitType.STOPLOSS_ON_EXCHANGE.value self.update_trade_state(trade, trade.stoploss_order_id, stoploss_order, stoploss_order=True) @@ -1324,7 +1322,7 @@ class FreqtradeBot(LoggingMixin): if not strategy_safe_wrapper(self.strategy.confirm_trade_exit, default_retval=True)( pair=trade.pair, trade=trade, order_type=order_type, amount=amount, rate=limit, time_in_force=time_in_force, exit_reason=exit_reason.exit_reason, - current_time=datetime.now(timezone.utc)): # TODO-lev: Update to exit + current_time=datetime.now(timezone.utc)): logger.info(f"User requested abortion of exiting {trade.pair}") return False diff --git a/freqtrade/persistence/migrations.py b/freqtrade/persistence/migrations.py index 13f0f710f..600b1d17c 100644 --- a/freqtrade/persistence/migrations.py +++ b/freqtrade/persistence/migrations.py @@ -74,7 +74,6 @@ def migrate_trades_table(decl_base, inspector, engine, table_back_name: str, col close_profit_abs = get_column_def( cols, 'close_profit_abs', f"(amount * close_rate * (1 - {fee_close})) - {open_trade_value}") - # TODO-lev: update to exit order status exit_order_status = get_column_def(cols, 'exit_order_status', 'null') amount_requested = get_column_def(cols, 'amount_requested', 'amount') diff --git a/tests/conftest_trades.py b/tests/conftest_trades.py index 9a7525975..918dec007 100644 --- a/tests/conftest_trades.py +++ b/tests/conftest_trades.py @@ -400,7 +400,7 @@ def short_trade(fee): open_order_id='dry_run_exit_short_12345', strategy='DefaultStrategy', timeframe=5, - exit_reason='exit_signal', # TODO-lev: Update to exit/close reason + exit_reason='exit_signal', open_date=datetime.now(tz=timezone.utc) - timedelta(minutes=20), # close_date=datetime.now(tz=timezone.utc) - timedelta(minutes=2), is_short=True