mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge #16361: Remove redundant pre-TopUpKeypool check

Browse Source 
96b6dd468a Remove redundant pre-TopUpKeypool checks (Gregory Sanders)

Pull request description:

  TopUpKeypool already has a quick check for `IsLocked()`

ACKs for top commit:
  achow101:
    ACK 96b6dd468a Reviewed the diff and checked that the `if (!IsLocked()) TopUpKeypool()` pattern is changed everywhere.

Tree-SHA512: 36f5ae1be611404656ac855763e569fd3b5e932db8170f39ebda74300aa02062774b2c28ce6cf00f2ccc0e3550de58df36efa9097e24f0a51f2809b8a489c95a
This commit is contained in:
MarcoFalke 2019-07-10 13:31:05 -04:00
commit ff0aad8a40
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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,7 +3475,6 @@ 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;
@ -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)) {