diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py index 26648ea6f..2de06864a 100644 --- a/freqtrade/commands/arguments.py +++ b/freqtrade/commands/arguments.py @@ -74,8 +74,7 @@ ARGS_PLOT_DATAFRAME = ["pairs", "indicators1", "indicators2", "plot_limit", "db_url", "trade_source", "export", "exportfilename", "timerange", "timeframe", "no_trades"] -ARGS_PLOT_PROFIT = ["pairs", "timerange", "export", "exportfilename", "backtestfilename", "db_url", - "trade_source", "timeframe", "plot_auto_open"] +ARGS_PLOT_PROFIT = [ "pairs", "timerange", "export", "exportfilename", "db_url", "trade_source", "timeframe", "plot_auto_open", ] ARGS_INSTALL_UI = ["erase_ui_only", 'ui_version'] diff --git a/freqtrade/commands/cli_options.py b/freqtrade/commands/cli_options.py index f081e809c..11fcc6b81 100644 --- a/freqtrade/commands/cli_options.py +++ b/freqtrade/commands/cli_options.py @@ -183,17 +183,12 @@ AVAILABLE_CLI_OPTIONS = { ), "exportfilename": Arg( "--export-filename", - help="Save backtest results to the file with this filename. " + "--backtest-filename", + help="Use this filename for backtest results." "Requires `--export` to be set as well. " "Example: `--export-filename=user_data/backtest_results/backtest_today.json`", metavar="PATH", ), - "backtestfilename": Arg( - "--backtest-filename", - help="Use backtest results from this filename." - "Example: `--backtest-filename=user_data/backtest_results/backtest_today.json`", - metavar="PATH", - ), "disableparamexport": Arg( '--disable-param-export', help="Disable automatic hyperopt parameter export.", diff --git a/freqtrade/configuration/configuration.py b/freqtrade/configuration/configuration.py index 5bff9a91c..adfe8b698 100644 --- a/freqtrade/configuration/configuration.py +++ b/freqtrade/configuration/configuration.py @@ -430,13 +430,6 @@ class Configuration: self._args_to_config(config, argname='dataformat_trades', logstring='Using "{}" to store trades data.') - if self.args.get('backtestfilename'): - self._args_to_config(config, argname='backtestfilename', - logstring='Fetching backtest results from {} ...') - config['backtestfilename'] = Path(config['backtestfilename']) - else: - config['backtestfilename'] = (config['user_data_dir'] - / 'backtest_results') def _process_data_options(self, config: Dict[str, Any]) -> None: diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py index 17cc11550..90c6c1bce 100644 --- a/freqtrade/plot/plotting.py +++ b/freqtrade/plot/plotting.py @@ -61,12 +61,8 @@ def init_plotscript(config, markets: List, startup_candles: int = 0): startup_candles, min_date) no_trades = False - for arg_name in ['exportfilename', 'backtestfilename']: - filename = config.get(arg_name) - if filename is not None: - break - - if config.get('no_trades', False): + filename = config.get("exportfilename") + if config.get("no_trades", False): no_trades = True elif config['trade_source'] == 'file': if not filename.is_dir() and not filename.is_file():