diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py index 0bb572ebc..51e2630cb 100755 --- a/freqtrade/commands/arguments.py +++ b/freqtrade/commands/arguments.py @@ -37,7 +37,6 @@ ARGS_COMMON_OPTIMIZE = [ ARGS_BACKTEST = ARGS_COMMON_OPTIMIZE + [ "position_stacking", - "use_max_market_positions", "enable_protections", "dry_run_wallet", "timeframe_detail", @@ -53,7 +52,6 @@ ARGS_HYPEROPT = ARGS_COMMON_OPTIMIZE + [ "hyperopt", "hyperopt_path", "position_stacking", - "use_max_market_positions", "enable_protections", "dry_run_wallet", "timeframe_detail", @@ -242,8 +240,7 @@ ARGS_STRATEGY_UPDATER = ["strategy_list", "strategy_path", "recursive_strategy_s ARGS_LOOKAHEAD_ANALYSIS = [ a for a in ARGS_BACKTEST - if a - not in ("position_stacking", "use_max_market_positions", "backtest_cache", "backtest_breakdown") + if a not in ("position_stacking", "backtest_cache", "backtest_breakdown") ] + ["minimum_trade_amount", "targeted_trade_amount", "lookahead_analysis_exportfilename"] ARGS_RECURSIVE_ANALYSIS = ["timeframe", "timerange", "dataformat_ohlcv", "pairs", "startup_candle"] diff --git a/freqtrade/commands/cli_options.py b/freqtrade/commands/cli_options.py index d279569c5..6e90a521f 100755 --- a/freqtrade/commands/cli_options.py +++ b/freqtrade/commands/cli_options.py @@ -168,14 +168,6 @@ AVAILABLE_CLI_OPTIONS = { action="store_true", default=False, ), - "use_max_market_positions": Arg( - "--dmmp", - "--disable-max-market-positions", - help="Disable applying `max_open_trades` during backtest " - "(same as setting `max_open_trades` to a very high number).", - action="store_false", - default=True, - ), "backtest_show_pair_list": Arg( "--show-pair-list", help="Show backtesting pairlist sorted by profit.", diff --git a/freqtrade/configuration/configuration.py b/freqtrade/configuration/configuration.py index c9ab86737..4f317719f 100644 --- a/freqtrade/configuration/configuration.py +++ b/freqtrade/configuration/configuration.py @@ -241,11 +241,7 @@ class Configuration: logstring="Parameter --enable-protections detected, enabling Protections. ...", ) - if "use_max_market_positions" in self.args and not self.args["use_max_market_positions"]: - config.update({"use_max_market_positions": False}) - logger.info("Parameter --disable-max-market-positions detected ...") - logger.info("max_open_trades set to unlimited ...") - elif "max_open_trades" in self.args and self.args["max_open_trades"]: + if "max_open_trades" in self.args and self.args["max_open_trades"]: config.update({"max_open_trades": self.args["max_open_trades"]}) logger.info( "Parameter --max-open-trades detected, overriding max_open_trades to: %s ...", diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index f9bc45fca..21f59ede8 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -1552,12 +1552,6 @@ class Backtesting: backtest_start_time = datetime.now(timezone.utc) self._set_strategy(strat) - # Use max_open_trades in backtesting, except --disable-max-market-positions is set - if not self.config.get("use_max_market_positions", True): - logger.info("Ignoring max_open_trades (--disable-max-market-positions was used) ...") - self.strategy.max_open_trades = float("inf") - self.config.update({"max_open_trades": self.strategy.max_open_trades}) - # need to reprocess data every time to populate signals preprocessed = self.strategy.advise_all_indicators(data) diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt.py index daa4661ad..0f7ab5422 100644 --- a/freqtrade/optimize/hyperopt.py +++ b/freqtrade/optimize/hyperopt.py @@ -127,12 +127,6 @@ class Hyperopt: self.num_epochs_saved = 0 self.current_best_epoch: Optional[dict[str, Any]] = None - # Use max_open_trades for hyperopt as well, except --disable-max-market-positions is set - if not self.config.get("use_max_market_positions", True): - logger.debug("Ignoring max_open_trades (--disable-max-market-positions was used) ...") - self.backtesting.strategy.max_open_trades = float("inf") - config.update({"max_open_trades": self.backtesting.strategy.max_open_trades}) - if HyperoptTools.has_space(self.config, "sell"): # Make sure use_exit_signal is enabled self.config["use_exit_signal"] = True