adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3490 from freqtrade/fix/timeframe_collision

Browse Source 
Fix bug in timeframe deprecation
This commit is contained in:
Matthias 2020-06-17 06:14:32 +02:00 committed by GitHub
commit 5e99be0a32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freqtrade/configuration/deprecated_settings.py
View File

@ -72,4 +72,9 @@ def process_temporary_deprecated_settings(config: Dict[str, Any]) -> None:
"DEPRECATED: " "DEPRECATED: "
"Please use 'timeframe' instead of 'ticker_interval." "Please use 'timeframe' instead of 'ticker_interval."
) )
if 'timeframe' in config:
raise OperationalException(
"Both 'timeframe' and 'ticker_interval' detected."
"Please remove 'ticker_interval' from your configuration to continue operating."
)
config['timeframe'] = config['ticker_interval'] config['timeframe'] = config['ticker_interval']

20
tests/test_configuration.py
View File

@ -1144,11 +1144,21 @@ def test_process_deprecated_setting(mocker, default_conf, caplog):
def test_process_deprecated_ticker_interval(mocker, default_conf, caplog): def test_process_deprecated_ticker_interval(mocker, default_conf, caplog):
message = "DEPRECATED: Please use 'timeframe' instead of 'ticker_interval." message = "DEPRECATED: Please use 'timeframe' instead of 'ticker_interval."
process_temporary_deprecated_settings(default_conf) config = deepcopy(default_conf)
process_temporary_deprecated_settings(config)
assert not log_has(message, caplog) assert not log_has(message, caplog)
del default_conf['timeframe'] del config['timeframe']
default_conf['ticker_interval'] = '15m' config['ticker_interval'] = '15m'
process_temporary_deprecated_settings(default_conf) process_temporary_deprecated_settings(config)
assert log_has(message, caplog) assert log_has(message, caplog)
assert default_conf['ticker_interval'] == '15m' assert config['ticker_interval'] == '15m'
config = deepcopy(default_conf)
# Have both timeframe and ticker interval in config
# Can also happen when using ticker_interval in configuration, and --timeframe as cli argument
config['timeframe'] = '5m'
config['ticker_interval'] = '4h'
with pytest.raises(OperationalException,
match=r"Both 'timeframe' and 'ticker_interval' detected."):
process_temporary_deprecated_settings(config)