From 238ff6c9fe7fa5681730f42201810ed57bae9c2d Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 8 Apr 2022 17:30:23 +0200 Subject: [PATCH] Use better naming --- config_examples/config_full.example.json | 2 +- freqtrade/configuration/load_config.py | 4 ++-- tests/testdata/testconfigs/recursive.json | 2 +- tests/testdata/testconfigs/test_pricing_conf.json | 2 +- tests/testdata/testconfigs/testconfig.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config_examples/config_full.example.json b/config_examples/config_full.example.json index b41acb726..193cc30bc 100644 --- a/config_examples/config_full.example.json +++ b/config_examples/config_full.example.json @@ -182,7 +182,7 @@ "disable_dataframe_checks": false, "strategy": "SampleStrategy", "strategy_path": "user_data/strategies/", - "files": [], + "add_config_files": [], "dataformat_ohlcv": "json", "dataformat_trades": "jsongz" } diff --git a/freqtrade/configuration/load_config.py b/freqtrade/configuration/load_config.py index 5a86ab24a..c6a81d384 100644 --- a/freqtrade/configuration/load_config.py +++ b/freqtrade/configuration/load_config.py @@ -99,8 +99,8 @@ def load_from_files(files: List[str], base_path: Path = None, level: int = 0) -> file = base_path / file config_tmp = load_config_file(str(file)) - if 'files' in config_tmp: - config_sub = load_from_files(config_tmp['files'], file.resolve().parent, level + 1) + if 'add_config_files' in config_tmp: + config_sub = load_from_files(config_tmp['add_config_files'], file.resolve().parent, level + 1) files_loaded.extend(config_sub.get('config_files', [])) deep_merge_dicts(config_sub, config_tmp) diff --git a/tests/testdata/testconfigs/recursive.json b/tests/testdata/testconfigs/recursive.json index 28d8ce05a..33ab12008 100644 --- a/tests/testdata/testconfigs/recursive.json +++ b/tests/testdata/testconfigs/recursive.json @@ -1,6 +1,6 @@ { // This file fails as it's loading itself over and over - "files": [ + "add_config_files": [ "./recursive.json" ] } diff --git a/tests/testdata/testconfigs/test_pricing_conf.json b/tests/testdata/testconfigs/test_pricing_conf.json index fbdaede74..59516d65e 100644 --- a/tests/testdata/testconfigs/test_pricing_conf.json +++ b/tests/testdata/testconfigs/test_pricing_conf.json @@ -15,7 +15,7 @@ "order_book_top": 1, "price_last_balance": 0.0 }, - "files": [ + "add_config_files": [ "./test_pricing2_conf.json" ] } diff --git a/tests/testdata/testconfigs/testconfig.json b/tests/testdata/testconfigs/testconfig.json index 96b3b6db8..87ed6daef 100644 --- a/tests/testdata/testconfigs/testconfig.json +++ b/tests/testdata/testconfigs/testconfig.json @@ -1,5 +1,5 @@ { - "files": [ + "add_config_files": [ "test_base_config.json", "test_pricing_conf.json" ]