From 9c76ba18cdfe01fe9266e0dcf6714dbe0abbb837 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 29 Aug 2017 11:48:25 -0400 Subject: [PATCH] [wallet] Rename InitLoadWallet() to OpenWallets() Rationale: - this init function can now open multiple wallets (hence Wallet->Wallets) - This is named as the antonym to CloseWallets(), which carries out the opposite action. --- src/init.cpp | 2 +- src/wallet/init.cpp | 2 +- src/wallet/init.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 7c99dc74efc..387bd2e2f76 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1567,7 +1567,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) // ********************************************************* Step 8: load wallet #ifdef ENABLE_WALLET - if (!InitLoadWallet()) + if (!OpenWallets()) return false; #else LogPrintf("No wallet support compiled in!\n"); diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 18365b1b72a..95b188b629a 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -228,7 +228,7 @@ bool WalletVerify() return true; } -bool InitLoadWallet() +bool OpenWallets() { if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) { LogPrintf("Wallet disabled!\n"); diff --git a/src/wallet/init.h b/src/wallet/init.h index fa2251506de..1821e5e7071 100644 --- a/src/wallet/init.h +++ b/src/wallet/init.h @@ -20,6 +20,6 @@ bool WalletParameterInteraction(); bool WalletVerify(); //! Load wallet databases. -bool InitLoadWallet(); +bool OpenWallets(); #endif // BITCOIN_WALLET_INIT_H