diff options
author | fanquake <fanquake@gmail.com> | 2023-03-31 16:56:51 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-03-31 17:03:32 +0100 |
commit | a0d37d1d230b837ebb0ec8f609885ab89280936c (patch) | |
tree | 24e98ec88f1bbeae5793d51f8a83122af2308d14 /src/wallet/scriptpubkeyman.cpp | |
parent | 5c2bb2b54cc7fceef4b9db631536ee6ed8129864 (diff) | |
parent | 1869310f3cfa4ab26b5090d8a4002eefdc84870e (diff) | |
download | bitcoin-a0d37d1d230b837ebb0ec8f609885ab89280936c.tar.xz |
Merge bitcoin/bitcoin#27274: refactor: remove unused param from legacy pubkey interface
1869310f3cfa4ab26b5090d8a4002eefdc84870e refactor: remove unused param from legacy pubkey (Bushstar)
Pull request description:
Unused param present in legacy pubkey manager interface. This param will not be used and should be removed to prevent unintended usage.
ACKs for top commit:
Sjors:
ACK 1869310f3cfa4ab26b5090d8a4002eefdc84870e
furszy:
ACK 1869310f3cfa4ab26b5090d8a4002eefdc84870e
Tree-SHA512: 0fb41fc8f481f859262f2e8e9a93c990c1b4637e74fd9191ccc0b3c523d0e7d94217a3074bb357276e1941a10d29326f850f9b27eccc1eca57cf6b549353400c
Diffstat (limited to 'src/wallet/scriptpubkeyman.cpp')
-rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index a1956049e2..62bd0c06cd 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -1385,10 +1385,10 @@ void LegacyScriptPubKeyMan::ReturnDestination(int64_t nIndex, bool fInternal, co WalletLogPrintf("keypool return %d\n", nIndex); } -bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, const OutputType type, bool internal) +bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, const OutputType type) { assert(type != OutputType::BECH32M); - if (!CanGetAddresses(internal)) { + if (!CanGetAddresses(/*internal=*/ false)) { return false; } @@ -1396,10 +1396,10 @@ bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, const OutputType typ { LOCK(cs_KeyStore); int64_t nIndex; - if (!ReserveKeyFromKeyPool(nIndex, keypool, internal) && !m_storage.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) { + if (!ReserveKeyFromKeyPool(nIndex, keypool, /*fRequestedInternal=*/ false) && !m_storage.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) { if (m_storage.IsLocked()) return false; WalletBatch batch(m_storage.GetDatabase()); - result = GenerateNewKey(batch, m_hd_chain, internal); + result = GenerateNewKey(batch, m_hd_chain, /*internal=*/ false); return true; } KeepDestination(nIndex, type); |