Browse Source

[wallet] Rename WalletVerify() to VerifyWallets()

This function can now verify multiple wallets.
0.16
John Newbery 7 years ago
parent
commit
1b9cee66e1
  1. 2
      src/init.cpp
  2. 2
      src/wallet/init.cpp
  3. 2
      src/wallet/init.h

2
src/init.cpp

@ -1246,7 +1246,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
// ********************************************************* Step 5: verify wallet database integrity // ********************************************************* Step 5: verify wallet database integrity
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if (!WalletVerify()) if (!VerifyWallets())
return false; return false;
#endif #endif
// ********************************************************* Step 6: network initialization // ********************************************************* Step 6: network initialization

2
src/wallet/init.cpp

@ -171,7 +171,7 @@ bool WalletParameterInteraction()
return true; return true;
} }
bool WalletVerify() bool VerifyWallets()
{ {
if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
return true; return true;

2
src/wallet/init.h

@ -17,7 +17,7 @@ bool WalletParameterInteraction();
//! Responsible for reading and validating the -wallet arguments and verifying the wallet database. //! 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 // 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). // being loaded (CWallet::ParameterInteraction forbids -salvagewallet, -zapwallettxes or -upgradewallet with multiwallet).
bool WalletVerify(); bool VerifyWallets();
//! Load wallet databases. //! Load wallet databases.
bool OpenWallets(); bool OpenWallets();

Loading…
Cancel
Save