foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

Warn on unknown rw_settings

Browse source
This commit is contained in:
MarcoFalke 2020-07-30 10:50:54 +02:00
parent 862fde88be
commit fa48405ef8
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/util/system.cpp
View file

@ -426,6 +426,14 @@ bool ArgsManager::ReadSettingsFile(std::vector<std::string>* errors)
SaveErrors(read_errors, errors); SaveErrors(read_errors, errors);
return false; return false;
} }
for (const auto& setting : m_settings.rw_settings) {
std::string section;
std::string key = setting.first;
(void)InterpretOption(section, key, /* value */ {}); // Split setting key into section and argname
if (!GetArgFlags('-' + key)) {
LogPrintf("Ignoring unknown rw_settings value %s\n", setting.first);
}
}
return true; return true;
} }

12
test/functional/feature_settings.py
View file

@ -30,19 +30,25 @@ class SettingsTest(BitcoinTestFramework):
# Assert settings are parsed and logged # Assert settings are parsed and logged
with settings.open("w") as fp: with settings.open("w") as fp:
json.dump({"string": "string", "num": 5, "bool": True, "null": None, "list": [6,7]}, fp) json.dump({"string": "string", "num": 5, "bool": True, "null": None, "list": [6, 7]}, fp)
with node.assert_debug_log(expected_msgs=[ with node.assert_debug_log(expected_msgs=[
'Ignoring unknown rw_settings value bool',
'Ignoring unknown rw_settings value list',
'Ignoring unknown rw_settings value null',
'Ignoring unknown rw_settings value num',
'Ignoring unknown rw_settings value string',
'Setting file arg: string = "string"', 'Setting file arg: string = "string"',
'Setting file arg: num = 5', 'Setting file arg: num = 5',
'Setting file arg: bool = true', 'Setting file arg: bool = true',
'Setting file arg: null = null', 'Setting file arg: null = null',
'Setting file arg: list = [6,7]']): 'Setting file arg: list = [6,7]',
]):
self.start_node(0) self.start_node(0)
self.stop_node(0) self.stop_node(0)
# Assert settings are unchanged after shutdown # Assert settings are unchanged after shutdown
with settings.open() as fp: with settings.open() as fp:
assert_equal(json.load(fp), {"string": "string", "num": 5, "bool": True, "null": None, "list": [6,7]}) assert_equal(json.load(fp), {"string": "string", "num": 5, "bool": True, "null": None, "list": [6, 7]})
# Test invalid json # Test invalid json
with settings.open("w") as fp: with settings.open("w") as fp: