From a12f36879655e5875927d98c57194dde44c939f7 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 4 Jan 2024 16:25:40 +0100 Subject: [PATCH] Move binance migration to behind migrations gate --- freqtrade/commands/data_commands.py | 4 ++-- freqtrade/data/history/history_utils.py | 4 ++-- freqtrade/freqtradebot.py | 2 +- freqtrade/optimize/backtesting.py | 4 ++-- freqtrade/util/migrations/__init__.py | 6 ++++++ freqtrade/util/{ => migrations}/binance_mig.py | 0 tests/test_binance_mig.py | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 freqtrade/util/migrations/__init__.py rename freqtrade/util/{ => migrations}/binance_mig.py (100%) diff --git a/freqtrade/commands/data_commands.py b/freqtrade/commands/data_commands.py index 229373400..0eaf5e563 100644 --- a/freqtrade/commands/data_commands.py +++ b/freqtrade/commands/data_commands.py @@ -12,7 +12,7 @@ from freqtrade.enums import RunMode, TradingMode from freqtrade.exceptions import OperationalException from freqtrade.exchange import timeframe_to_minutes from freqtrade.resolvers import ExchangeResolver -from freqtrade.util.binance_mig import migrate_binance_futures_data +from freqtrade.util.migrations import migrate_data logger = logging.getLogger(__name__) @@ -78,7 +78,7 @@ def start_convert_data(args: Dict[str, Any], ohlcv: bool = True) -> None: """ config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE) if ohlcv: - migrate_binance_futures_data(config) + migrate_data(config) convert_ohlcv_format(config, convert_from=args['format_from'], convert_to=args['format_to'], diff --git a/freqtrade/data/history/history_utils.py b/freqtrade/data/history/history_utils.py index b4a21e1d0..ad8eedfc5 100644 --- a/freqtrade/data/history/history_utils.py +++ b/freqtrade/data/history/history_utils.py @@ -18,8 +18,8 @@ from freqtrade.exceptions import OperationalException from freqtrade.exchange import Exchange from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist from freqtrade.util import dt_ts, format_ms_time -from freqtrade.util.binance_mig import migrate_binance_futures_data from freqtrade.util.datetime_helpers import dt_now +from freqtrade.util.migrations import migrate_data logger = logging.getLogger(__name__) @@ -531,7 +531,7 @@ def download_data_main(config: Config) -> None: "Please use `--dl-trades` instead for this exchange " "(will unfortunately take a long time)." ) - migrate_binance_futures_data(config) + migrate_data(config) pairs_not_available = refresh_backtest_ohlcv_data( exchange, pairs=expanded_pairs, timeframes=config['timeframes'], datadir=config['datadir'], timerange=timerange, diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 070770795..f81eccd67 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -38,7 +38,7 @@ from freqtrade.rpc.rpc_types import (ProfitLossStr, RPCCancelMsg, RPCEntryMsg, R from freqtrade.strategy.interface import IStrategy from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper from freqtrade.util import FtPrecise -from freqtrade.util.binance_mig import migrate_binance_futures_names +from freqtrade.util.migrations import migrate_binance_futures_names from freqtrade.wallets import Wallets diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index 3d933185a..3827f90c9 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -40,7 +40,7 @@ from freqtrade.resolvers import ExchangeResolver, StrategyResolver from freqtrade.strategy.interface import IStrategy from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper from freqtrade.types import BacktestResultType, get_BacktestResultType_default -from freqtrade.util.binance_mig import migrate_binance_futures_data +from freqtrade.util.migrations import migrate_data from freqtrade.wallets import Wallets @@ -158,7 +158,7 @@ class Backtesting: self._can_short = self.trading_mode != TradingMode.SPOT self._position_stacking: bool = self.config.get('position_stacking', False) self.enable_protections: bool = self.config.get('enable_protections', False) - migrate_binance_futures_data(config) + migrate_data(config) self.init_backtest() diff --git a/freqtrade/util/migrations/__init__.py b/freqtrade/util/migrations/__init__.py new file mode 100644 index 000000000..a8ac5e7f9 --- /dev/null +++ b/freqtrade/util/migrations/__init__.py @@ -0,0 +1,6 @@ +from freqtrade.util.migrations.binance_mig import migrate_binance_futures_names # noqa F401 +from freqtrade.util.migrations.binance_mig import migrate_binance_futures_data + + +def migrate_data(config): + migrate_binance_futures_data(config) diff --git a/freqtrade/util/binance_mig.py b/freqtrade/util/migrations/binance_mig.py similarity index 100% rename from freqtrade/util/binance_mig.py rename to freqtrade/util/migrations/binance_mig.py diff --git a/tests/test_binance_mig.py b/tests/test_binance_mig.py index b7c821a5a..9b3e927d3 100644 --- a/tests/test_binance_mig.py +++ b/tests/test_binance_mig.py @@ -5,7 +5,7 @@ import shutil import pytest from freqtrade.persistence import Trade -from freqtrade.util.binance_mig import migrate_binance_futures_data, migrate_binance_futures_names +from freqtrade.util.migrations import migrate_binance_futures_data, migrate_binance_futures_names from tests.conftest import create_mock_trades_usdt, log_has