keypool: Remove superfluous topup from CWallet::GetNewChangeDestination

achow101 · achow101 · commit bb2c8ce23c9d · 2019-11-22T23:45:34.000-05:00
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.
diff --git 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";

Original file line number	Diff line number	Diff line change
`@@ -3122,8 +3122,6 @@ bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& des`
`3122`	`3122`	`{`
`3123`	`3123`	`error.clear();`
`3124`	`3124`
`3125`		`- m_spk_man->TopUp();`
`3126`		`-`
`3127`	`3125`	`ReserveDestination reservedest(this, type);`
`3128`	`3126`	`if (!reservedest.GetReservedDestination(dest, true)) {`
`3129`	`3127`	`error = "Error: Keypool ran out, please call keypoolrefill first";`