From 1b9cee66e1c50cb6f110793ec5dc4c6a291cce36 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 29 Aug 2017 11:51:02 -0400 Subject: [PATCH] [wallet] Rename WalletVerify() to VerifyWallets() This function can now verify multiple wallets. --- 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 387bd2e2f..ce368a6bb 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1246,7 +1246,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) // ********************************************************* Step 5: verify wallet database integrity #ifdef ENABLE_WALLET - if (!WalletVerify()) + if (!VerifyWallets()) return false; #endif // ********************************************************* Step 6: network initialization diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 95b188b62..f39201e79 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -171,7 +171,7 @@ bool WalletParameterInteraction() return true; } -bool WalletVerify() +bool VerifyWallets() { if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) return true; diff --git a/src/wallet/init.h b/src/wallet/init.h index 1821e5e70..a66b35943 100644 --- a/src/wallet/init.h +++ b/src/wallet/init.h @@ -17,7 +17,7 @@ bool WalletParameterInteraction(); //! Responsible for reading and validating the -wallet arguments and verifying the wallet database. // This function will perform salvage on the wallet if requested, as long as only one wallet is // being loaded (CWallet::ParameterInteraction forbids -salvagewallet, -zapwallettxes or -upgradewallet with multiwallet). -bool WalletVerify(); +bool VerifyWallets(); //! Load wallet databases. bool OpenWallets();