diff options
| author | Andrew Chow <[email protected]> | 2019-11-20 12:38:44 -0500 |
|---|---|---|
| committer | Andrew Chow <[email protected]> | 2019-11-22 23:45:34 -0500 |
| commit | bb2c8ce23c9d7ba8d0e5538243e07218443c85b4 (patch) | |
| tree | ba69a2c29e32a5f5fa44720e07f81b63a6528d7e /src/wallet/wallet.cpp | |
| parent | Merge #17447: wallet: Make -walletdir network only (diff) | |
| download | discoin-bb2c8ce23c9d7ba8d0e5538243e07218443c85b4.tar.xz discoin-bb2c8ce23c9d7ba8d0e5538243e07218443c85b4.zip | |
keypool: Remove superfluous topup from CWallet::GetNewChangeDestination
This does not change behavior. This TopUp() is unnecessary as currently
m_spk_man calls TopUp further down the call stack inside
LegacyScriptPubKeyMan::ReserveKeyFromKeyPool (called by LegacyScriptPubKeyMan::GetReservedDestination)
By removing this here, we also prepare for future changes where CWallet
has multiple ScriptPubKeyMans instead of m_spk_man.
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b1e1385ca..65ac67982 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3122,8 +3122,6 @@ bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& des { error.clear(); - m_spk_man->TopUp(); - ReserveDestination reservedest(this, type); if (!reservedest.GetReservedDestination(dest, true)) { error = "Error: Keypool ran out, please call keypoolrefill first"; |