From 1b46a4889f894d63062454fb9f4c2e88689a9d75 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Thu, 4 Apr 2019 15:45:37 -0400 Subject: [PATCH] [cleanup] Remove unused CReserveKey --- src/script/script.h | 9 --------- src/validationinterface.h | 1 - src/wallet/wallet.h | 3 +-- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/script/script.h b/src/script/script.h index 1d8ddba2f..11e8661a5 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -581,13 +581,4 @@ struct CScriptWitness std::string ToString() const; }; -class CReserveScript -{ -public: - CScript reserveScript; - virtual void KeepScript() {} - CReserveScript() {} - virtual ~CReserveScript() {} -}; - #endif // BITCOIN_SCRIPT_SCRIPT_H diff --git a/src/validationinterface.h b/src/validationinterface.h index 78f3026a8..ea1b2e7e7 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -18,7 +18,6 @@ class CBlockIndex; struct CBlockLocator; class CBlockIndex; class CConnman; -class CReserveScript; class CValidationInterface; class CValidationState; class uint256; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index cefdf479c..f4deec4f3 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1219,7 +1219,7 @@ public: void MaybeResendWalletTxs(); /** A key allocated from the key pool. */ -class CReserveKey final : public CReserveScript +class CReserveKey { protected: CWallet* pwallet; @@ -1244,7 +1244,6 @@ public: void ReturnKey(); bool GetReservedKey(CPubKey &pubkey, bool internal = false); void KeepKey(); - void KeepScript() override { KeepKey(); } }; /** RAII object to check and reserve a wallet rescan */