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

wallettool: pass in DatabaseOptions into MakeWallet

Browse source
This commit is contained in:
Ivan Metlushko 2020-11-11 11:40:02 +07:00
parent fa8dd34e91
commit 6d3af3ab62
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/wallet/wallettool.cpp
View file

@ -36,15 +36,9 @@ static void WalletCreate(CWallet* wallet_instance)
wallet_instance->TopUpKeyPool(); wallet_instance->TopUpKeyPool();
} }
static std::shared_ptr<CWallet> MakeWallet(const std::string& name, const fs::path& path, bool create) static std::shared_ptr<CWallet> MakeWallet(const std::string& name, const fs::path& path, DatabaseOptions options)
{ {
DatabaseOptions options;
DatabaseStatus status; DatabaseStatus status;
if (create) {
options.require_create = true;
} else {
options.require_existing = true;
}
bilingual_str error; bilingual_str error;
std::unique_ptr<WalletDatabase> database = MakeDatabase(path, options, status, error); std::unique_ptr<WalletDatabase> database = MakeDatabase(path, options, status, error);
if (!database) { if (!database) {
@ -85,7 +79,7 @@ static std::shared_ptr<CWallet> MakeWallet(const std::string& name, const fs::pa
} }
} }
if (create) WalletCreate(wallet_instance.get()); if (options.require_create) WalletCreate(wallet_instance.get());
return wallet_instance; return wallet_instance;
} }
@ -110,14 +104,18 @@ bool ExecuteWalletToolFunc(const std::string& command, const std::string& name)
fs::path path = fs::absolute(name, GetWalletDir()); fs::path path = fs::absolute(name, GetWalletDir());
if (command == "create") { if (command == "create") {
std::shared_ptr<CWallet> wallet_instance = MakeWallet(name, path, /* create= */ true); DatabaseOptions options;
options.require_create = true;
std::shared_ptr<CWallet> wallet_instance = MakeWallet(name, path, options);
if (wallet_instance) { if (wallet_instance) {
WalletShowInfo(wallet_instance.get()); WalletShowInfo(wallet_instance.get());
wallet_instance->Close(); wallet_instance->Close();
} }
} else if (command == "info" || command == "salvage") { } else if (command == "info" || command == "salvage") {
if (command == "info") { if (command == "info") {
std::shared_ptr<CWallet> wallet_instance = MakeWallet(name, path, /* create= */ false); DatabaseOptions options;
options.require_existing = true;
std::shared_ptr<CWallet> wallet_instance = MakeWallet(name, path, options);
if (!wallet_instance) return false; if (!wallet_instance) return false;
WalletShowInfo(wallet_instance.get()); WalletShowInfo(wallet_instance.get());
wallet_instance->Close(); wallet_instance->Close();