aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2019-11-12 13:56:18 -0500
committerRussell Yanofsky <russ@yanofsky.org>2019-11-13 04:20:30 -0500
commit0fa54358b06b58f4d17073bcc8a959eb9498aadc (patch)
tree1b525815e05e08b6af223202da9b9a6679d7b8a2
parent3e185522ace1678e0a25b9cf8a5553a4bc279bea (diff)
refactor: Add ArgsManager::GetSettingsList method
Add for consistency with ArgsManager::GetSetting method and to make setting types accessible to ArgsManager callers and tests (test added next commit). This commit does not change behavior.
-rw-r--r--src/util/system.cpp11
-rw-r--r--src/util/system.h5
2 files changed, 12 insertions, 4 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 8ea8234225..b6a026b02a 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -352,11 +352,8 @@ Optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const
std::vector<std::string> ArgsManager::GetArgs(const std::string& strArg) const
{
- LOCK(cs_args);
- bool ignore_default_section_config = !UseDefaultSection(strArg);
std::vector<std::string> result;
- for (const util::SettingsValue& value :
- util::GetSettingsList(m_settings, m_network, SettingName(strArg), ignore_default_section_config)) {
+ for (const util::SettingsValue& value : GetSettingsList(strArg)) {
result.push_back(value.isFalse() ? "0" : value.isTrue() ? "1" : value.get_str());
}
return result;
@@ -869,6 +866,12 @@ util::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
m_settings, m_network, SettingName(arg), !UseDefaultSection(arg), /* get_chain_name= */ false);
}
+std::vector<util::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const
+{
+ LOCK(cs_args);
+ return util::GetSettingsList(m_settings, m_network, SettingName(arg), !UseDefaultSection(arg));
+}
+
bool RenameOver(fs::path src, fs::path dest)
{
#ifdef WIN32
diff --git a/src/util/system.h b/src/util/system.h
index 4db3028196..633560d70c 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -180,6 +180,11 @@ protected:
*/
util::SettingsValue GetSetting(const std::string& arg) const;
+ /**
+ * Get list of setting values.
+ */
+ std::vector<util::SettingsValue> GetSettingsList(const std::string& arg) const;
+
public:
ArgsManager();