refactor: Add ArgsManager::GetSettingsList method

ryanofsky · ryanofsky · commit 0fa54358b06b · 2019-11-13T04:20:30.000-05:00
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.
diff --git 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
@@ -180,6 +180,11 @@ class ArgsManager
      */
     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();
 

Original file line number	Diff line number	Diff line change
`@@ -352,11 +352,8 @@ Optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const`
`352`	`352`
`353`	`353`	`std::vector<std::string> ArgsManager::GetArgs(const std::string& strArg) const`
`354`	`354`	`{`
`355`		`- LOCK(cs_args);`
`356`		`- bool ignore_default_section_config = !UseDefaultSection(strArg);`
`357`	`355`	`std::vector<std::string> result;`
`358`		`- for (const util::SettingsValue& value :`
`359`		`- util::GetSettingsList(m_settings, m_network, SettingName(strArg), ignore_default_section_config)) {`
	`356`	`+ for (const util::SettingsValue& value : GetSettingsList(strArg)) {`
`360`	`357`	`result.push_back(value.isFalse() ? "0" : value.isTrue() ? "1" : value.get_str());`
`361`	`358`	`}`
`362`	`359`	`return result;`
`@@ -869,6 +866,12 @@ util::SettingsValue ArgsManager::GetSetting(const std::string& arg) const`
`869`	`866`	`m_settings, m_network, SettingName(arg), !UseDefaultSection(arg), /* get_chain_name= */ false);`
`870`	`867`	`}`
`871`	`868`
	`869`	`+std::vector<util::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const`
	`870`	`+{`
	`871`	`+ LOCK(cs_args);`
	`872`	`+ return util::GetSettingsList(m_settings, m_network, SettingName(arg), !UseDefaultSection(arg));`
	`873`	`+}`
	`874`	`+`
`872`	`875`	`bool RenameOver(fs::path src, fs::path dest)`
`873`	`876`	`{`
`874`	`877`	`#ifdef WIN32`