[wallet] move-only: move CReserveKey to be next to CKeyPool

jnewbery · jnewbery · commit ef2d515af3c7 · 2019-04-14T09:32:40.000-04:00
reviewer tip: use git diff --color-moved=dimmed-zebra
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -181,6 +181,34 @@ class CKeyPool
     }
 };
 
+/** A key allocated from the key pool. */
+class CReserveKey
+{
+protected:
+    CWallet* pwallet;
+    int64_t nIndex{-1};
+    CPubKey vchPubKey;
+    bool fInternal{false};
+
+public:
+    explicit CReserveKey(CWallet* pwalletIn)
+    {
+        pwallet = pwalletIn;
+    }
+
+    CReserveKey(const CReserveKey&) = delete;
+    CReserveKey& operator=(const CReserveKey&) = delete;
+
+    ~CReserveKey()
+    {
+        ReturnKey();
+    }
+
+    void ReturnKey();
+    bool GetReservedKey(CPubKey &pubkey, bool internal = false);
+    void KeepKey();
+};
+
 /** Address book data */
 class CAddressBookData
 {
@@ -1218,34 +1246,6 @@ class CWallet final : public CCryptoKeyStore, private interfaces::Chain::Notific
  */
 void MaybeResendWalletTxs();
 
-/** A key allocated from the key pool. */
-class CReserveKey
-{
-protected:
-    CWallet* pwallet;
-    int64_t nIndex{-1};
-    CPubKey vchPubKey;
-    bool fInternal{false};
-
-public:
-    explicit CReserveKey(CWallet* pwalletIn)
-    {
-        pwallet = pwalletIn;
-    }
-
-    CReserveKey(const CReserveKey&) = delete;
-    CReserveKey& operator=(const CReserveKey&) = delete;
-
-    ~CReserveKey()
-    {
-        ReturnKey();
-    }
-
-    void ReturnKey();
-    bool GetReservedKey(CPubKey &pubkey, bool internal = false);
-    void KeepKey();
-};
-
 /** RAII object to check and reserve a wallet rescan */
 class WalletRescanReserver
 {
