aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-08-29 11:51:02 -0400
committerJohn Newbery <john@johnnewbery.com>2017-09-07 16:21:09 -0700
commit1b9cee66e1c50cb6f110793ec5dc4c6a291cce36 (patch)
tree77654dbc19f0924841b6181008f6b72f3a0244ca
parent9c76ba18cdfe01fe9266e0dcf6714dbe0abbb837 (diff)
downloadbitcoin-1b9cee66e1c50cb6f110793ec5dc4c6a291cce36.tar.xz
[wallet] Rename WalletVerify() to VerifyWallets()
This function can now verify multiple wallets.
-rw-r--r--src/init.cpp2
-rw-r--r--src/wallet/init.cpp2
-rw-r--r--src/wallet/init.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 387bd2e2f7..ce368a6bb1 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 95b188b629..f39201e79c 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 1821e5e707..a66b359439 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();