aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2019-04-04 15:45:37 -0400
committerJohn Newbery <john@johnnewbery.com>2019-04-10 11:44:40 -0400
commit1b46a4889f894d63062454fb9f4c2e88689a9d75 (patch)
treeba67a7227117f0c02755a2c1d171befe408b65a9
parent9819ad6d07097ca4df92231e18de0b57313e3b78 (diff)
[cleanup] Remove unused CReserveKey
-rw-r--r--src/script/script.h9
-rw-r--r--src/validationinterface.h1
-rw-r--r--src/wallet/wallet.h3
3 files changed, 1 insertions, 12 deletions
diff --git a/src/script/script.h b/src/script/script.h
index 1d8ddba2f2..11e8661a5b 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 78f3026a80..ea1b2e7e76 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 cefdf479c6..f4deec4f32 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 */