mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-03 09:43:55 +02:00
Merge bitcoin/bitcoin#27150: Deduplicate bitcoind and bitcoin-qt init code
802cc1ef53Deduplicate bitcoind and bitcoin-qt init code (Ryan Ofsky)d172b5c671Add InitError(error, details) overload (Ryan Ofsky)3db2874bd7Extend bilingual_str support for tinyformat (Ryan Ofsky)c361df90b9scripted-diff: Remove double newlines after some init errors (Ryan Ofsky) Pull request description: Add common InitConfig function to deduplicate bitcoind and bitcoin-qt code reading config files and creating the datadir. Noticed the duplicate code while reviewing #27073 and want to remove it because difference in bitcoin-qt and bitcoind behavior make it hard to evaluate changes like #27073 There are a few minor changes in behavior: - In bitcoin-qt, when there is a problem reading the configuration file, the GUI error text has changed from "Error: Cannot parse configuration file:" to "Error reading configuration file:" to be consistent with bitcoind. - In bitcoind, when there is a problem reading the settings.json file, the error text has changed from "Failed loading settings file" to "Settings file could not be read" to be consistent with bitcoin-qt. - In bitcoind, when there is a problem writing the settings.json file, the error text has changed from "Failed saving settings file" to "Settings file could not be written" to be consistent with bitcoin-qt. - In bitcoin-qt, if there datadir is not accessible (e.g. no permission to read), there is an normal error dialog showing "Error: filesystem error: status: Permission denied [.../settings.json]", instead of an uncaught exception. ACKs for top commit: Sjors: Light review ACK802cc1ef53TheCharlatan: ACK802cc1ef53achow101: ACK802cc1ef53Tree-SHA512: 9c78d277e9ed595fa8ce286b97d2806e1ec06ddbbe7bd3434bd9dd7b456faf8d989f71231e97311f36edb9caaec645a50c730bd7514b8e0fe6e6f7741b13d981
This commit is contained in:
@@ -438,27 +438,6 @@ const fs::path& ArgsManager::GetDataDir(bool net_specific) const
|
||||
return path;
|
||||
}
|
||||
|
||||
void ArgsManager::EnsureDataDir() const
|
||||
{
|
||||
/**
|
||||
* "/wallets" subdirectories are created in all **new**
|
||||
* datadirs, because wallet code will create new wallets in the "wallets"
|
||||
* subdirectory only if exists already, otherwise it will create them in
|
||||
* the top-level datadir where they could interfere with other files.
|
||||
* Wallet init code currently avoids creating "wallets" directories itself
|
||||
* for backwards compatibility, but this be changed in the future and
|
||||
* wallet code here could go away (#16220).
|
||||
*/
|
||||
auto path{GetDataDir(false)};
|
||||
if (!fs::exists(path)) {
|
||||
fs::create_directories(path / "wallets");
|
||||
}
|
||||
path = GetDataDir(true);
|
||||
if (!fs::exists(path)) {
|
||||
fs::create_directories(path / "wallets");
|
||||
}
|
||||
}
|
||||
|
||||
void ArgsManager::ClearPathCache()
|
||||
{
|
||||
LOCK(cs_args);
|
||||
@@ -502,25 +481,6 @@ bool ArgsManager::IsArgSet(const std::string& strArg) const
|
||||
return !GetSetting(strArg).isNull();
|
||||
}
|
||||
|
||||
bool ArgsManager::InitSettings(std::string& error)
|
||||
{
|
||||
EnsureDataDir();
|
||||
if (!GetSettingsPath()) {
|
||||
return true; // Do nothing if settings file disabled.
|
||||
}
|
||||
|
||||
std::vector<std::string> errors;
|
||||
if (!ReadSettingsFile(&errors)) {
|
||||
error = strprintf("Failed loading settings file:\n%s\n", MakeUnorderedList(errors));
|
||||
return false;
|
||||
}
|
||||
if (!WriteSettingsFile(&errors)) {
|
||||
error = strprintf("Failed saving settings file:\n%s\n", MakeUnorderedList(errors));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp, bool backup) const
|
||||
{
|
||||
fs::path settings = GetPathArg("-settings", BITCOIN_SETTINGS_FILENAME);
|
||||
|
||||
@@ -434,13 +434,6 @@ protected:
|
||||
*/
|
||||
std::optional<unsigned int> GetArgFlags(const std::string& name) const;
|
||||
|
||||
/**
|
||||
* Read and update settings file with saved settings. This needs to be
|
||||
* called after SelectParams() because the settings file location is
|
||||
* network-specific.
|
||||
*/
|
||||
bool InitSettings(std::string& error);
|
||||
|
||||
/**
|
||||
* Get settings file path, or return false if read-write settings were
|
||||
* disabled with -nosettings.
|
||||
@@ -480,12 +473,6 @@ protected:
|
||||
*/
|
||||
void LogArgs() const;
|
||||
|
||||
/**
|
||||
* If datadir does not exist, create it along with wallets/
|
||||
* subdirectory(s).
|
||||
*/
|
||||
void EnsureDataDir() const;
|
||||
|
||||
private:
|
||||
/**
|
||||
* Get data directory path
|
||||
|
||||
@@ -47,11 +47,24 @@ inline bilingual_str operator+(bilingual_str lhs, const bilingual_str& rhs)
|
||||
/** Mark a bilingual_str as untranslated */
|
||||
inline bilingual_str Untranslated(std::string original) { return {original, original}; }
|
||||
|
||||
// Provide an overload of tinyformat::format which can take bilingual_str arguments.
|
||||
namespace tinyformat {
|
||||
inline std::string TranslateArg(const bilingual_str& arg, bool translated)
|
||||
{
|
||||
return translated ? arg.translated : arg.original;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
inline T const& TranslateArg(const T& arg, bool translated)
|
||||
{
|
||||
return arg;
|
||||
}
|
||||
|
||||
template <typename... Args>
|
||||
bilingual_str format(const bilingual_str& fmt, const Args&... args)
|
||||
{
|
||||
return bilingual_str{format(fmt.original, args...), format(fmt.translated, args...)};
|
||||
return bilingual_str{format(fmt.original, TranslateArg(args, false)...),
|
||||
format(fmt.translated, TranslateArg(args, true)...)};
|
||||
}
|
||||
} // namespace tinyformat
|
||||
|
||||
|
||||
Reference in New Issue
Block a user