highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 07:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Keep/ReturnKey to Keep/ReturnDestination and remove the wrapper

Browse Source 
There is no reason to have Keep/ReturnDestination to be a wrapper for
Keep/ReturnKey. Instead just make them the same function.
This commit is contained in:
Andrew Chow
2019-11-19 18:33:20 -05:00
parent 596f6460f9
commit 9fcf8ce7ae
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wallet/scriptpubkeyman.cpp
View File

@@ -274,16 +274,6 @@ bool LegacyScriptPubKeyMan::GetReservedDestination(const OutputType type, bool i
return true; return true;
} }
void LegacyScriptPubKeyMan::KeepDestination(int64_t index)
{
KeepKey(index);
}
void LegacyScriptPubKeyMan::ReturnDestination(int64_t index, bool internal, const CPubKey& pubkey)
{
ReturnKey(index, internal, pubkey);
}
void LegacyScriptPubKeyMan::MarkUnusedAddresses(const CScript& script) void LegacyScriptPubKeyMan::MarkUnusedAddresses(const CScript& script)
{ {
AssertLockHeld(cs_wallet); AssertLockHeld(cs_wallet);
@@ -1096,7 +1086,7 @@ void LegacyScriptPubKeyMan::AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const
m_pool_key_to_index[pubkey.GetID()] = index; m_pool_key_to_index[pubkey.GetID()] = index;
} }
void LegacyScriptPubKeyMan::KeepKey(int64_t nIndex) void LegacyScriptPubKeyMan::KeepDestination(int64_t nIndex)
{ {
// Remove from key pool // Remove from key pool
WalletBatch batch(m_storage.GetDatabase()); WalletBatch batch(m_storage.GetDatabase());
@@ -1104,7 +1094,7 @@ void LegacyScriptPubKeyMan::KeepKey(int64_t nIndex)
WalletLogPrintf("keypool keep %d\n", nIndex); WalletLogPrintf("keypool keep %d\n", nIndex);
} }
void LegacyScriptPubKeyMan::ReturnKey(int64_t nIndex, bool fInternal, const CPubKey& pubkey) void LegacyScriptPubKeyMan::ReturnDestination(int64_t nIndex, bool fInternal, const CPubKey& pubkey)
{ {
// Return to key pool // Return to key pool
{ {
@@ -1138,7 +1128,7 @@ bool LegacyScriptPubKeyMan::GetKeyFromPool(CPubKey& result, bool internal)
result = GenerateNewKey(batch, internal); result = GenerateNewKey(batch, internal);
return true; return true;
} }
KeepKey(nIndex); KeepDestination(nIndex);
result = keypool.vchPubKey; result = keypool.vchPubKey;
} }
return true; return true;

3
src/wallet/scriptpubkeyman.h
View File

@@ -266,9 +266,6 @@ private:
*/ */
bool ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRequestedInternal); bool ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRequestedInternal);
void KeepKey(int64_t nIndex);
void ReturnKey(int64_t nIndex, bool fInternal, const CPubKey& pubkey);
public: public:
bool GetNewDestination(const OutputType type, CTxDestination& dest, std::string& error) override; bool GetNewDestination(const OutputType type, CTxDestination& dest, std::string& error) override;
isminetype IsMine(const CScript& script) const override; isminetype IsMine(const CScript& script) const override;