mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 14:08:40 +01:00
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-
This commit is contained in:
@@ -132,7 +132,7 @@ CBanDB::CBanDB(fs::path ban_list_path)
|
||||
bool CBanDB::Write(const banmap_t& banSet)
|
||||
{
|
||||
std::vector<std::string> errors;
|
||||
if (util::WriteSettings(m_banlist_json, {{JSON_KEY, BanMapToJson(banSet)}}, errors)) {
|
||||
if (common::WriteSettings(m_banlist_json, {{JSON_KEY, BanMapToJson(banSet)}}, errors)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -152,10 +152,10 @@ bool CBanDB::Read(banmap_t& banSet)
|
||||
return false;
|
||||
}
|
||||
|
||||
std::map<std::string, util::SettingsValue> settings;
|
||||
std::map<std::string, common::SettingsValue> settings;
|
||||
std::vector<std::string> errors;
|
||||
|
||||
if (!util::ReadSettings(m_banlist_json, settings, errors)) {
|
||||
if (!common::ReadSettings(m_banlist_json, settings, errors)) {
|
||||
for (const auto& err : errors) {
|
||||
LogPrintf("Cannot load banlist %s: %s\n", fs::PathToString(m_banlist_json), err);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user