diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-04-14 16:08:47 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-04-14 16:09:05 +1200 |
| commit | adc55dbac5b521d6c9df58d1d69075e6abf0116f (patch) | |
| tree | 5987cc537699de8bd23f1499624b40c8819f0c17 /src/wallet/wallet.h | |
| parent | 66ce95a4340019ed3be8a36a8aeec86e4f0ace85 (diff) | |
| parent | 1b46a4889f894d63062454fb9f4c2e88689a9d75 (diff) | |
Merge #15748: [rpc] remove dead mining code
1b46a4889 [cleanup] Remove unused CReserveKey (John Newbery)
9819ad6d0 [rpc] simplify generate RPC (John Newbery)
Pull request description:
Removes dead code from after the generate method was removed
ACKs for commit 1b46a4:
MarcoFalke:
utACK 1b46a4889f894d63062454fb9f4c2e88689a9d75
meshcollider:
utACK https://github.com/bitcoin/bitcoin/pull/15748/commits/1b46a4889f894d63062454fb9f4c2e88689a9d75
scravy:
utACK 1b46a48
Empact:
utACK https://github.com/bitcoin/bitcoin/pull/15748/commits/1b46a4889f894d63062454fb9f4c2e88689a9d75
Tree-SHA512: d1fab1bf76ac3036b85cf33be89868bc016f912575545ecaa16f958397b0ec4f1ce4de8fe254d4f21aabeea9c83a8928530cc520de26af0d1a8bdb4ca0f2cb77
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 4cc6973802..53de1ea065 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 */ |