mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

Use context.args in src/wallet/load.cpp.

Browse source
This commit is contained in:
Kiminuo 2021-08-25 16:08:51 +02:00
parent 25de4e77fe
commit c3c213215b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wallet/load.cpp
View file

@ -8,6 +8,7 @@
#include <fs.h> #include <fs.h>
#include <interfaces/chain.h> #include <interfaces/chain.h>
#include <scheduler.h> #include <scheduler.h>
#include <util/check.h>
#include <util/string.h> #include <util/string.h>
#include <util/system.h> #include <util/system.h>
#include <util/translation.h> #include <util/translation.h>
@ -20,8 +21,10 @@
bool VerifyWallets(WalletContext& context) bool VerifyWallets(WalletContext& context)
{ {
interfaces::Chain& chain = *context.chain; interfaces::Chain& chain = *context.chain;
if (gArgs.IsArgSet("-walletdir")) { ArgsManager& args = *Assert(context.args);
fs::path wallet_dir = gArgs.GetArg("-walletdir", "");
if (args.IsArgSet("-walletdir")) {
fs::path wallet_dir = args.GetArg("-walletdir", "");
boost::system::error_code error; boost::system::error_code error;
// The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory // The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory
fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error); fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error);
@ -36,7 +39,7 @@ bool VerifyWallets(WalletContext& context)
chain.initError(strprintf(_("Specified -walletdir \"%s\" is a relative path"), wallet_dir.string())); chain.initError(strprintf(_("Specified -walletdir \"%s\" is a relative path"), wallet_dir.string()));
return false; return false;
} }
gArgs.ForceSetArg("-walletdir", canonical_wallet_dir.string()); args.ForceSetArg("-walletdir", canonical_wallet_dir.string());
} }
LogPrintf("Using wallet directory %s\n", GetWalletDir().string()); LogPrintf("Using wallet directory %s\n", GetWalletDir().string());
@ -45,7 +48,7 @@ bool VerifyWallets(WalletContext& context)
// For backwards compatibility if an unnamed top level wallet exists in the // For backwards compatibility if an unnamed top level wallet exists in the
// wallets directory, include it in the default list of wallets to load. // wallets directory, include it in the default list of wallets to load.
if (!gArgs.IsArgSet("wallet")) { if (!args.IsArgSet("wallet")) {
DatabaseOptions options; DatabaseOptions options;
DatabaseStatus status; DatabaseStatus status;
bilingual_str error_string; bilingual_str error_string;