foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00
Code Issues Activity

Remove redundant pre-TopUpKeypool checks

Browse source
This commit is contained in:
Gregory Sanders 2019-07-09 10:09:56 -04:00
parent 6c1e45c4c4
commit 96b6dd468a
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/wallet/wallet.cpp
View file

@ -3414,8 +3414,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
if (IsLocked()) if (IsLocked()) return false;
return false;
// Top up key pool // Top up key pool
unsigned int nTargetSize; unsigned int nTargetSize;
@ -3476,8 +3475,7 @@ bool CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRe
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
if (!IsLocked()) TopUpKeyPool();
TopUpKeyPool();
bool fReturningInternal = fRequestedInternal; bool fReturningInternal = fRequestedInternal;
fReturningInternal &= (IsHDEnabled() && CanSupportFeature(FEATURE_HD_SPLIT)) || IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS); fReturningInternal &= (IsHDEnabled() && CanSupportFeature(FEATURE_HD_SPLIT)) || IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS);
@ -3568,9 +3566,8 @@ bool CWallet::GetNewDestination(const OutputType type, const std::string label,
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
error.clear(); error.clear();
if (!IsLocked()) {
TopUpKeyPool(); TopUpKeyPool();
}
// Generate a new key that is added to wallet // Generate a new key that is added to wallet
CPubKey new_key; CPubKey new_key;
@ -3588,9 +3585,8 @@ bool CWallet::GetNewDestination(const OutputType type, const std::string label,
bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& dest, std::string& error) bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& dest, std::string& error)
{ {
error.clear(); error.clear();
if (!IsLocked()) {
TopUpKeyPool(); TopUpKeyPool();
}
ReserveDestination reservedest(this); ReserveDestination reservedest(this);
if (!reservedest.GetReservedDestination(type, dest, true)) { if (!reservedest.GetReservedDestination(type, dest, true)) {