diff --git a/freqtrade/commands/analyze_commands.py b/freqtrade/commands/analyze_commands.py index e928ccad7..54f7b27e5 100644 --- a/freqtrade/commands/analyze_commands.py +++ b/freqtrade/commands/analyze_commands.py @@ -4,7 +4,7 @@ from typing import Any, Dict from freqtrade.configuration import setup_utils_configuration from freqtrade.enums import RunMode -from freqtrade.exceptions import OperationalException +from freqtrade.exceptions import ConfigurationError logger = logging.getLogger(__name__) @@ -34,12 +34,12 @@ def setup_analyze_configuration(args: Dict[str, Any], method: RunMode) -> Dict[s btfile = Path(config['exportfilename']) signals_file = f"{btfile.parent}/{btfile.stem}_signals.pkl" else: - raise OperationalException(f"{config['exportfilename']} does not exist.") + raise ConfigurationError(f"{config['exportfilename']} does not exist.") else: - raise OperationalException('exportfilename not in config.') + raise ConfigurationError('exportfilename not in config.') if (not Path(signals_file).exists()): - raise OperationalException( + raise ConfigurationError( f"Cannot find latest backtest signals file: {signals_file}." "Run backtesting with `--export signals`." ) diff --git a/freqtrade/commands/data_commands.py b/freqtrade/commands/data_commands.py index 2279cdc39..6762a83da 100644 --- a/freqtrade/commands/data_commands.py +++ b/freqtrade/commands/data_commands.py @@ -9,7 +9,7 @@ from freqtrade.data.converter import (convert_ohlcv_format, convert_trades_forma convert_trades_to_ohlcv) from freqtrade.data.history import download_data_main from freqtrade.enums import CandleType, RunMode, TradingMode -from freqtrade.exceptions import OperationalException +from freqtrade.exceptions import ConfigurationError from freqtrade.exchange import timeframe_to_minutes from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist from freqtrade.resolvers import ExchangeResolver @@ -21,11 +21,11 @@ logger = logging.getLogger(__name__) def _check_data_config_download_sanity(config: Config) -> None: if 'days' in config and 'timerange' in config: - raise OperationalException("--days and --timerange are mutually exclusive. " - "You can only specify one or the other.") + raise ConfigurationError("--days and --timerange are mutually exclusive. " + "You can only specify one or the other.") if 'pairs' not in config: - raise OperationalException( + raise ConfigurationError( "Downloading data requires a list of pairs. " "Please check the documentation on how to configure this.") diff --git a/freqtrade/commands/list_commands.py b/freqtrade/commands/list_commands.py index 84f237f77..550c29f69 100644 --- a/freqtrade/commands/list_commands.py +++ b/freqtrade/commands/list_commands.py @@ -10,7 +10,7 @@ from tabulate import tabulate from freqtrade.configuration import setup_utils_configuration from freqtrade.enums import RunMode -from freqtrade.exceptions import OperationalException +from freqtrade.exceptions import ConfigurationError, OperationalException from freqtrade.exchange import list_available_exchanges, market_is_active from freqtrade.misc import parse_db_uri_for_logging, plural from freqtrade.resolvers import ExchangeResolver, StrategyResolver @@ -246,7 +246,7 @@ def start_show_trades(args: Dict[str, Any]) -> None: config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE) if 'db_url' not in config: - raise OperationalException("--db-url is required for this command.") + raise ConfigurationError("--db-url is required for this command.") logger.info(f'Using DB: "{parse_db_uri_for_logging(config["db_url"])}"') init_db(config['db_url']) diff --git a/freqtrade/commands/optimize_commands.py b/freqtrade/commands/optimize_commands.py index 837a5e4f3..f010a3cee 100644 --- a/freqtrade/commands/optimize_commands.py +++ b/freqtrade/commands/optimize_commands.py @@ -4,7 +4,7 @@ from typing import Any, Dict from freqtrade import constants from freqtrade.configuration import setup_utils_configuration from freqtrade.enums import RunMode -from freqtrade.exceptions import OperationalException +from freqtrade.exceptions import ConfigurationError, OperationalException from freqtrade.util import fmt_coin @@ -31,7 +31,7 @@ def setup_optimize_configuration(args: Dict[str, Any], method: RunMode) -> Dict[ and config['stake_amount'] > wallet_size): wallet = fmt_coin(wallet_size, config['stake_currency']) stake = fmt_coin(config['stake_amount'], config['stake_currency']) - raise OperationalException( + raise ConfigurationError( f"Starting balance ({wallet}) is smaller than stake_amount {stake}. " f"Wallet is calculated as `dry_run_wallet * tradable_balance_ratio`." ) diff --git a/freqtrade/commands/plot_commands.py b/freqtrade/commands/plot_commands.py index 73a429a28..95ad3cdce 100644 --- a/freqtrade/commands/plot_commands.py +++ b/freqtrade/commands/plot_commands.py @@ -2,12 +2,12 @@ from typing import Any, Dict from freqtrade.configuration import setup_utils_configuration from freqtrade.enums import RunMode -from freqtrade.exceptions import OperationalException +from freqtrade.exceptions import ConfigurationError def validate_plot_args(args: Dict[str, Any]) -> None: if not args.get('datadir') and not args.get('config'): - raise OperationalException( + raise ConfigurationError( "You need to specify either `--datadir` or `--config` " "for plot-profit and plot-dataframe.")