diff --git a/freqtrade/commands/__init__.py b/freqtrade/commands/__init__.py index 89b6fdc3a..ba977b6bd 100644 --- a/freqtrade/commands/__init__.py +++ b/freqtrade/commands/__init__.py @@ -16,7 +16,7 @@ from freqtrade.commands.hyperopt_commands import start_hyperopt_list, start_hype from freqtrade.commands.list_commands import (start_list_exchanges, start_list_markets, start_list_strategies, start_list_timeframes, start_show_trades) -from freqtrade.commands.optimize_commands import (start_backtest_filter, start_backtesting, +from freqtrade.commands.optimize_commands import (start_backtest_show, start_backtesting, start_edge, start_hyperopt) from freqtrade.commands.pairlist_commands import start_test_pairlist from freqtrade.commands.plot_commands import start_plot_dataframe, start_plot_profit diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py index 8f68e6521..be4f9188f 100644 --- a/freqtrade/commands/arguments.py +++ b/freqtrade/commands/arguments.py @@ -41,7 +41,7 @@ ARGS_LIST_STRATEGIES = ["strategy_path", "print_one_column", "print_colorized"] ARGS_LIST_HYPEROPTS = ["hyperopt_path", "print_one_column", "print_colorized"] -ARGS_BACKTEST_FILTER = ["exportfilename", "backtest_show_pair_list"] +ARGS_BACKTEST_SHOW = ["exportfilename", "backtest_show_pair_list"] ARGS_LIST_EXCHANGES = ["print_one_column", "list_exchanges_all"] @@ -175,7 +175,7 @@ class Arguments: self.parser = argparse.ArgumentParser(description='Free, open source crypto trading bot') self._build_args(optionlist=['version'], parser=self.parser) - from freqtrade.commands import (start_backtest_filter, start_backtesting, + from freqtrade.commands import (start_backtest_show, start_backtesting, start_convert_data, start_convert_trades, start_create_userdir, start_download_data, start_edge, start_hyperopt, start_hyperopt_list, start_hyperopt_show, @@ -267,14 +267,14 @@ class Arguments: backtesting_cmd.set_defaults(func=start_backtesting) self._build_args(optionlist=ARGS_BACKTEST, parser=backtesting_cmd) - # Add backtest-filter subcommand - backtest_filter_cmd = subparsers.add_parser( - 'backtest-filter', - help='Filter Backtest results', + # Add backtest-show subcommand + backtest_show_cmd = subparsers.add_parser( + 'backtest-show', + help='Show past Backtest results', parents=[_common_parser], ) - backtest_filter_cmd.set_defaults(func=start_backtest_filter) - self._build_args(optionlist=ARGS_BACKTEST_FILTER, parser=backtest_filter_cmd) + backtest_show_cmd.set_defaults(func=start_backtest_show) + self._build_args(optionlist=ARGS_BACKTEST_SHOW, parser=backtest_show_cmd) # Add edge subcommand edge_cmd = subparsers.add_parser('edge', help='Edge module.', diff --git a/freqtrade/commands/optimize_commands.py b/freqtrade/commands/optimize_commands.py index 0d1f304db..c35e78153 100644 --- a/freqtrade/commands/optimize_commands.py +++ b/freqtrade/commands/optimize_commands.py @@ -56,7 +56,7 @@ def start_backtesting(args: Dict[str, Any]) -> None: backtesting.start() -def start_backtest_filter(args: Dict[str, Any]) -> None: +def start_backtest_show(args: Dict[str, Any]) -> None: """ Show previous backtest result """ @@ -69,8 +69,6 @@ def start_backtest_filter(args: Dict[str, Any]) -> None: show_backtest_results(config, results) show_filtered_pairlist(config, results) - logger.info("Backtest filtering complete. ") - def start_hyperopt(args: Dict[str, Any]) -> None: """