Skip to content

Commit db77f87

Browse files
TheCharlatanTheCharlatan
committed
scripted-diff: move settings to common namespace
-BEGIN VERIFY SCRIPT- sed -i 's/namespace\ util/namespace\ common/g' src/common/settings.cpp src/common/settings.h sed -i 's/util\:\:GetSetting/common\:\:GetSetting/g' $( git grep -l 'util\:\:GetSetting') sed -i 's/util\:\:Setting/common\:\:Setting/g' $( git grep -l 'util\:\:Setting') sed -i 's/util\:\:FindKey/common\:\:FindKey/g' $( git grep -l 'util\:\:FindKey') sed -i 's/util\:\:ReadSettings/common\:\:ReadSettings/g' $( git grep -l 'util\:\:ReadSettings') sed -i 's/util\:\:WriteSettings/common\:\:WriteSettings/g' $( git grep -l 'util\:\:WriteSettings') -END VERIFY SCRIPT-
1 parent c27e4bd commit db77f87

18 files changed

+120
-120
lines changed

‎src/addrdb.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ CBanDB::CBanDB(fs::path ban_list_path)
132132
bool CBanDB::Write(const banmap_t& banSet)
133133
{
134134
std::vector<std::string> errors;
135-
if (util::WriteSettings(m_banlist_json, {{JSON_KEY, BanMapToJson(banSet)}}, errors)) {
135+
if (common::WriteSettings(m_banlist_json, {{JSON_KEY, BanMapToJson(banSet)}}, errors)) {
136136
return true;
137137
}
138138

@@ -152,10 +152,10 @@ bool CBanDB::Read(banmap_t& banSet)
152152
return false;
153153
}
154154

155-
std::map<std::string, util::SettingsValue> settings;
155+
std::map<std::string, common::SettingsValue> settings;
156156
std::vector<std::string> errors;
157157

158-
if (!util::ReadSettings(m_banlist_json, settings, errors)) {
158+
if (!common::ReadSettings(m_banlist_json, settings, errors)) {
159159
for (const auto& err : errors) {
160160
LogPrintf("Cannot load banlist %s: %s\n", fs::PathToString(m_banlist_json), err);
161161
}

‎src/common/args.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ KeyInfo InterpretKey(std::string key)
104104
* @return parsed settings value if it is valid, otherwise nullopt accompanied
105105
* by a descriptive error string
106106
*/
107-
std::optional<util::SettingsValue> InterpretValue(const KeyInfo& key, const std::string* value,
107+
std::optional<common::SettingsValue> InterpretValue(const KeyInfo& key, const std::string* value,
108108
unsigned int flags, std::string& error)
109109
{
110110
// Return negated settings as false values.
@@ -238,15 +238,15 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
238238
return false;
239239
}
240240

241-
std::optional<util::SettingsValue> value = InterpretValue(keyinfo, val ? &*val : nullptr, *flags, error);
241+
std::optional<common::SettingsValue> value = InterpretValue(keyinfo, val ? &*val : nullptr, *flags, error);
242242
if (!value) return false;
243243

244244
m_settings.command_line_options[keyinfo.name].push_back(*value);
245245
}
246246

247247
// we do not allow -includeconf from command line, only -noincludeconf
248-
if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
249-
const util::SettingsSpan values{*includes};
248+
if (auto* includes = common::FindKey(m_settings.command_line_options, "includeconf")) {
249+
const common::SettingsSpan values{*includes};
250250
// Range may be empty if -noincludeconf was passed
251251
if (!values.empty()) {
252252
error = "-includeconf cannot be used from commandline; -includeconf=" + values.begin()->write();
@@ -361,7 +361,7 @@ std::optional<const ArgsManager::Command> ArgsManager::GetCommand() const
361361
std::vector<std::string> ArgsManager::GetArgs(const std::string& strArg) const
362362
{
363363
std::vector<std::string> result;
364-
for (const util::SettingsValue& value : GetSettingsList(strArg)) {
364+
for (const common::SettingsValue& value : GetSettingsList(strArg)) {
365365
result.push_back(value.isFalse() ? "0" : value.isTrue() ? "1" : value.get_str());
366366
}
367367
return result;
@@ -408,7 +408,7 @@ bool ArgsManager::ReadSettingsFile(std::vector<std::string>* errors)
408408
LOCK(cs_args);
409409
m_settings.rw_settings.clear();
410410
std::vector<std::string> read_errors;
411-
if (!util::ReadSettings(path, m_settings.rw_settings, read_errors)) {
411+
if (!common::ReadSettings(path, m_settings.rw_settings, read_errors)) {
412412
SaveErrors(read_errors, errors);
413413
return false;
414414
}
@@ -430,7 +430,7 @@ bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors, bool backu
430430

431431
LOCK(cs_args);
432432
std::vector<std::string> write_errors;
433-
if (!util::WriteSettings(path_tmp, m_settings.rw_settings, write_errors)) {
433+
if (!common::WriteSettings(path_tmp, m_settings.rw_settings, write_errors)) {
434434
SaveErrors(write_errors, errors);
435435
return false;
436436
}
@@ -441,10 +441,10 @@ bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors, bool backu
441441
return true;
442442
}
443443

444-
util::SettingsValue ArgsManager::GetPersistentSetting(const std::string& name) const
444+
common::SettingsValue ArgsManager::GetPersistentSetting(const std::string& name) const
445445
{
446446
LOCK(cs_args);
447-
return util::GetSetting(m_settings, m_network, name, !UseDefaultSection("-" + name),
447+
return common::GetSetting(m_settings, m_network, name, !UseDefaultSection("-" + name),
448448
/*ignore_nonpersistent=*/true, /*get_chain_type=*/false);
449449
}
450450

@@ -460,11 +460,11 @@ std::string ArgsManager::GetArg(const std::string& strArg, const std::string& st
460460

461461
std::optional<std::string> ArgsManager::GetArg(const std::string& strArg) const
462462
{
463-
const util::SettingsValue value = GetSetting(strArg);
463+
const common::SettingsValue value = GetSetting(strArg);
464464
return SettingToString(value);
465465
}
466466

467-
std::optional<std::string> SettingToString(const util::SettingsValue& value)
467+
std::optional<std::string> SettingToString(const common::SettingsValue& value)
468468
{
469469
if (value.isNull()) return std::nullopt;
470470
if (value.isFalse()) return "0";
@@ -473,7 +473,7 @@ std::optional<std::string> SettingToString(const util::SettingsValue& value)
473473
return value.get_str();
474474
}
475475

476-
std::string SettingToString(const util::SettingsValue& value, const std::string& strDefault)
476+
std::string SettingToString(const common::SettingsValue& value, const std::string& strDefault)
477477
{
478478
return SettingToString(value).value_or(strDefault);
479479
}
@@ -485,11 +485,11 @@ int64_t ArgsManager::GetIntArg(const std::string& strArg, int64_t nDefault) cons
485485

486486
std::optional<int64_t> ArgsManager::GetIntArg(const std::string& strArg) const
487487
{
488-
const util::SettingsValue value = GetSetting(strArg);
488+
const common::SettingsValue value = GetSetting(strArg);
489489
return SettingToInt(value);
490490
}
491491

492-
std::optional<int64_t> SettingToInt(const util::SettingsValue& value)
492+
std::optional<int64_t> SettingToInt(const common::SettingsValue& value)
493493
{
494494
if (value.isNull()) return std::nullopt;
495495
if (value.isFalse()) return 0;
@@ -498,7 +498,7 @@ std::optional<int64_t> SettingToInt(const util::SettingsValue& value)
498498
return LocaleIndependentAtoi<int64_t>(value.get_str());
499499
}
500500

501-
int64_t SettingToInt(const util::SettingsValue& value, int64_t nDefault)
501+
int64_t SettingToInt(const common::SettingsValue& value, int64_t nDefault)
502502
{
503503
return SettingToInt(value).value_or(nDefault);
504504
}
@@ -510,18 +510,18 @@ bool ArgsManager::GetBoolArg(const std::string& strArg, bool fDefault) const
510510

511511
std::optional<bool> ArgsManager::GetBoolArg(const std::string& strArg) const
512512
{
513-
const util::SettingsValue value = GetSetting(strArg);
513+
const common::SettingsValue value = GetSetting(strArg);
514514
return SettingToBool(value);
515515
}
516516

517-
std::optional<bool> SettingToBool(const util::SettingsValue& value)
517+
std::optional<bool> SettingToBool(const common::SettingsValue& value)
518518
{
519519
if (value.isNull()) return std::nullopt;
520520
if (value.isBool()) return value.get_bool();
521521
return InterpretBool(value.get_str());
522522
}
523523

524-
bool SettingToBool(const util::SettingsValue& value, bool fDefault)
524+
bool SettingToBool(const common::SettingsValue& value, bool fDefault)
525525
{
526526
return SettingToBool(value).value_or(fDefault);
527527
}
@@ -738,7 +738,7 @@ std::variant<ChainType, std::string> ArgsManager::GetChainArg() const
738738
{
739739
auto get_net = [&](const std::string& arg) {
740740
LOCK(cs_args);
741-
util::SettingsValue value = util::GetSetting(m_settings, /* section= */ "", SettingName(arg),
741+
common::SettingsValue value = common::GetSetting(m_settings, /* section= */ "", SettingName(arg),
742742
/* ignore_default_section_config= */ false,
743743
/*ignore_nonpersistent=*/false,
744744
/* get_chain_type= */ true);
@@ -769,24 +769,24 @@ bool ArgsManager::UseDefaultSection(const std::string& arg) const
769769
return m_network == ChainTypeToString(ChainType::MAIN) || m_network_only_args.count(arg) == 0;
770770
}
771771

772-
util::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
772+
common::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
773773
{
774774
LOCK(cs_args);
775-
return util::GetSetting(
775+
return common::GetSetting(
776776
m_settings, m_network, SettingName(arg), !UseDefaultSection(arg),
777777
/*ignore_nonpersistent=*/false, /*get_chain_type=*/false);
778778
}
779779

780-
std::vector<util::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const
780+
std::vector<common::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const
781781
{
782782
LOCK(cs_args);
783-
return util::GetSettingsList(m_settings, m_network, SettingName(arg), !UseDefaultSection(arg));
783+
return common::GetSettingsList(m_settings, m_network, SettingName(arg), !UseDefaultSection(arg));
784784
}
785785

786786
void ArgsManager::logArgsPrefix(
787787
const std::string& prefix,
788788
const std::string& section,
789-
const std::map<std::string, std::vector<util::SettingsValue>>& args) const
789+
const std::map<std::string, std::vector<common::SettingsValue>>& args) const
790790
{
791791
std::string section_str = section.empty() ? "" : "[" + section + "] ";
792792
for (const auto& arg : args) {

‎src/common/args.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct KeyInfo {
7575

7676
KeyInfo InterpretKey(std::string key);
7777

78-
std::optional<util::SettingsValue> InterpretValue(const KeyInfo& key, const std::string* value,
78+
std::optional<common::SettingsValue> InterpretValue(const KeyInfo& key, const std::string* value,
7979
unsigned int flags, std::string& error);
8080

8181
struct SectionInfo {
@@ -84,14 +84,14 @@ struct SectionInfo {
8484
int m_line;
8585
};
8686

87-
std::string SettingToString(const util::SettingsValue&, const std::string&);
88-
std::optional<std::string> SettingToString(const util::SettingsValue&);
87+
std::string SettingToString(const common::SettingsValue&, const std::string&);
88+
std::optional<std::string> SettingToString(const common::SettingsValue&);
8989

90-
int64_t SettingToInt(const util::SettingsValue&, int64_t);
91-
std::optional<int64_t> SettingToInt(const util::SettingsValue&);
90+
int64_t SettingToInt(const common::SettingsValue&, int64_t);
91+
std::optional<int64_t> SettingToInt(const common::SettingsValue&);
9292

93-
bool SettingToBool(const util::SettingsValue&, bool);
94-
std::optional<bool> SettingToBool(const util::SettingsValue&);
93+
bool SettingToBool(const common::SettingsValue&, bool);
94+
std::optional<bool> SettingToBool(const common::SettingsValue&);
9595

9696
class ArgsManager
9797
{
@@ -130,7 +130,7 @@ class ArgsManager
130130
};
131131

132132
mutable RecursiveMutex cs_args;
133-
util::Settings m_settings GUARDED_BY(cs_args);
133+
common::Settings m_settings GUARDED_BY(cs_args);
134134
std::vector<std::string> m_command GUARDED_BY(cs_args);
135135
std::string m_network GUARDED_BY(cs_args);
136136
std::set<std::string> m_network_only_args GUARDED_BY(cs_args);
@@ -159,12 +159,12 @@ class ArgsManager
159159
* false if "-nosetting" argument was passed, and a string if a "-setting=value"
160160
* argument was passed.
161161
*/
162-
util::SettingsValue GetSetting(const std::string& arg) const;
162+
common::SettingsValue GetSetting(const std::string& arg) const;
163163

164164
/**
165165
* Get list of setting values.
166166
*/
167-
std::vector<util::SettingsValue> GetSettingsList(const std::string& arg) const;
167+
std::vector<common::SettingsValue> GetSettingsList(const std::string& arg) const;
168168

169169
ArgsManager();
170170
~ArgsManager();
@@ -394,7 +394,7 @@ class ArgsManager
394394
* Get current setting from config file or read/write settings file,
395395
* ignoring nonpersistent command line or forced settings values.
396396
*/
397-
util::SettingsValue GetPersistentSetting(const std::string& name) const;
397+
common::SettingsValue GetPersistentSetting(const std::string& name) const;
398398

399399
/**
400400
* Access settings with lock held.
@@ -433,7 +433,7 @@ class ArgsManager
433433
void logArgsPrefix(
434434
const std::string& prefix,
435435
const std::string& section,
436-
const std::map<std::string, std::vector<util::SettingsValue>>& args) const;
436+
const std::map<std::string, std::vector<common::SettingsValue>>& args) const;
437437
};
438438

439439
extern ArgsManager gArgs;

‎src/common/config.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
9898
std::optional<unsigned int> flags = GetArgFlags('-' + key.name);
9999
if (!IsConfSupported(key, error)) return false;
100100
if (flags) {
101-
std::optional<util::SettingsValue> value = InterpretValue(key, &option.second, *flags, error);
101+
std::optional<common::SettingsValue> value = InterpretValue(key, &option.second, *flags, error);
102102
if (!value) {
103103
return false;
104104
}
@@ -142,9 +142,9 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
142142
bool use_conf_file{true};
143143
{
144144
LOCK(cs_args);
145-
if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
145+
if (auto* includes = common::FindKey(m_settings.command_line_options, "includeconf")) {
146146
// ParseParameters() fails if a non-negated -includeconf is passed on the command-line
147-
assert(util::SettingsSpan(*includes).last_negated());
147+
assert(common::SettingsSpan(*includes).last_negated());
148148
use_conf_file = false;
149149
}
150150
}
@@ -155,9 +155,9 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
155155
auto add_includes = [&](const std::string& network, size_t skip = 0) {
156156
size_t num_values = 0;
157157
LOCK(cs_args);
158-
if (auto* section = util::FindKey(m_settings.ro_config, network)) {
159-
if (auto* values = util::FindKey(*section, "includeconf")) {
160-
for (size_t i = std::max(skip, util::SettingsSpan(*values).negated()); i < values->size(); ++i) {
158+
if (auto* section = common::FindKey(m_settings.ro_config, network)) {
159+
if (auto* values = common::FindKey(*section, "includeconf")) {
160+
for (size_t i = std::max(skip, common::SettingsSpan(*values).negated()); i < values->size(); ++i) {
161161
conf_file_names.push_back((*values)[i].get_str());
162162
}
163163
num_values = values->size();

‎src/common/settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <utility>
1717
#include <vector>
1818

19-
namespace util {
19+
namespace common {
2020
namespace {
2121

2222
enum class Source {
@@ -258,4 +258,4 @@ size_t SettingsSpan::negated() const
258258
return 0;
259259
}
260260

261-
} // namespace util
261+
} // namespace common

‎src/common/settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class UniValue;
1616

17-
namespace util {
17+
namespace common {
1818

1919
//! Settings value type (string/integer/boolean/null variant).
2020
//!
@@ -110,6 +110,6 @@ auto FindKey(Map&& map, Key&& key) -> decltype(&map.at(key))
110110
return it == map.end() ? nullptr : &it->second;
111111
}
112112

113-
} // namespace util
113+
} // namespace common
114114

115115
#endif // BITCOIN_COMMON_SETTINGS_H

‎src/interfaces/chain.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,17 +300,17 @@ class Chain
300300
virtual int rpcSerializationFlags() = 0;
301301

302302
//! Get settings value.
303-
virtual util::SettingsValue getSetting(const std::string& arg) = 0;
303+
virtual common::SettingsValue getSetting(const std::string& arg) = 0;
304304

305305
//! Get list of settings values.
306-
virtual std::vector<util::SettingsValue> getSettingsList(const std::string& arg) = 0;
306+
virtual std::vector<common::SettingsValue> getSettingsList(const std::string& arg) = 0;
307307

308308
//! Return <datadir>/settings.json setting value.
309-
virtual util::SettingsValue getRwSetting(const std::string& name) = 0;
309+
virtual common::SettingsValue getRwSetting(const std::string& name) = 0;
310310

311311
//! Write a setting to <datadir>/settings.json. Optionally just update the
312312
//! setting in memory and do not write the file.
313-
virtual bool updateRwSetting(const std::string& name, const util::SettingsValue& value, bool write=true) = 0;
313+
virtual bool updateRwSetting(const std::string& name, const common::SettingsValue& value, bool write=true) = 0;
314314

315315
//! Synchronously send transactionAddedToMempool notifications about all
316316
//! current mempool transactions to the specified handler and return after

‎src/interfaces/node.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ class Node
103103
virtual bool isSettingIgnored(const std::string& name) = 0;
104104

105105
//! Return setting value from <datadir>/settings.json or bitcoin.conf.
106-
virtual util::SettingsValue getPersistentSetting(const std::string& name) = 0;
106+
virtual common::SettingsValue getPersistentSetting(const std::string& name) = 0;
107107

108108
//! Update a setting in <datadir>/settings.json.
109-
virtual void updateRwSetting(const std::string& name, const util::SettingsValue& value) = 0;
109+
virtual void updateRwSetting(const std::string& name, const common::SettingsValue& value) = 0;
110110

111111
//! Force a setting value to be applied, overriding any other configuration
112112
//! source, but not being persisted.
113-
virtual void forceSetting(const std::string& name, const util::SettingsValue& value) = 0;
113+
virtual void forceSetting(const std::string& name, const common::SettingsValue& value) = 0;
114114

115115
//! Clear all settings in <datadir>/settings.json and store a backup of
116116
//! previous settings in <datadir>/settings.json.bak.

0 commit comments

Comments
 (0)