Merge #13658: [moveonly] Extract RescanWallet to handle a simple rescan

Summary: 3fe836b [moveonly] Extract RescanWallet to handle a simple rescan (Ben Woosley) Pull request description: Where the outcome does not depend on the result, apart from a simple success check. Tree-SHA512: e0d29c6fc0c7f99a730289e5a80deb586b2848aead56b5198a71ef01f65374812468dfd57be0b8b076eb9be4090d5101d28d979a1d5c3d2f1caeca77b303e90e Backport of Core PR12658 bitcoin/bitcoin#13658 Test Plan: make check ./bitcoin-qt -> help -> debug -> console -> rescanblockchain ./bitcoind ./bitcoin-cli rescanblockchain Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D4020
hacktron · Sep 6, 2019 · be3bf60 · be3bf60
1 parent cbabd40
commit be3bf60
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 42 deletions.
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -92,6 +92,21 @@ bool GetWalletAddressesForKey(const Config &config, CWallet *const pwallet,
     return fLabelFound;
 }
 
+static const int64_t TIMESTAMP_MIN = 0;
+
+static void RescanWallet(CWallet &wallet, const WalletRescanReserver &reserver,
+                         int64_t time_begin = TIMESTAMP_MIN,
+                         bool update = true) {
+    int64_t scanned_time = wallet.RescanFromTime(time_begin, reserver, update);
+    if (wallet.IsAbortingRescan()) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
+    } else if (scanned_time > time_begin) {
+        throw JSONRPCError(RPC_WALLET_ERROR,
+                           "Rescan was unable to fully rescan the blockchain. "
+                           "Some transactions may be missing.");
+    }
+}
+
 UniValue importprivkey(const Config &config, const JSONRPCRequest &request) {
     CWallet *const pwallet = GetWalletForJSONRPCRequest(request);
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
@@ -192,16 +207,7 @@ UniValue importprivkey(const Config &config, const JSONRPCRequest &request) {
         }
     }
     if (fRescan) {
-        int64_t scanned_time =
-            pwallet->RescanFromTime(TIMESTAMP_MIN, reserver, true /* update */);
-        if (pwallet->IsAbortingRescan()) {
-            throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
-        }
-        if (scanned_time > TIMESTAMP_MIN) {
-            throw JSONRPCError(RPC_WALLET_ERROR,
-                               "Rescan was unable to fully rescan the "
-                               "blockchain. Some transactions may be missing.");
-        }
+        RescanWallet(*pwallet, reserver);
     }
 
     return NullUniValue;
@@ -370,16 +376,7 @@ UniValue importaddress(const Config &config, const JSONRPCRequest &request) {
         }
     }
     if (fRescan) {
-        int64_t scanned_time =
-            pwallet->RescanFromTime(TIMESTAMP_MIN, reserver, true /* update */);
-        if (pwallet->IsAbortingRescan()) {
-            throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
-        }
-        if (scanned_time > TIMESTAMP_MIN) {
-            throw JSONRPCError(RPC_WALLET_ERROR,
-                               "Rescan was unable to fully rescan the "
-                               "blockchain. Some transactions may be missing.");
-        }
+        RescanWallet(*pwallet, reserver);
         pwallet->ReacceptWalletTransactions();
     }
 
@@ -591,16 +588,7 @@ UniValue importpubkey(const Config &config, const JSONRPCRequest &request) {
         pwallet->LearnAllRelatedScripts(pubKey);
     }
     if (fRescan) {
-        int64_t scanned_time =
-            pwallet->RescanFromTime(TIMESTAMP_MIN, reserver, true /* update */);
-        if (pwallet->IsAbortingRescan()) {
-            throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
-        }
-        if (scanned_time > TIMESTAMP_MIN) {
-            throw JSONRPCError(RPC_WALLET_ERROR,
-                               "Rescan was unable to fully rescan the "
-                               "blockchain. Some transactions may be missing.");
-        }
+        RescanWallet(*pwallet, reserver);
         pwallet->ReacceptWalletTransactions();
     }
 
@@ -753,16 +741,7 @@ UniValue importwallet(const Config &config, const JSONRPCRequest &request) {
     }
     // hide progress dialog in GUI
     uiInterface.ShowProgress("", 100, false);
-    int64_t scanned_time =
-        pwallet->RescanFromTime(nTimeBegin, reserver, false /* update */);
-    if (pwallet->IsAbortingRescan()) {
-        throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
-    }
-    if (scanned_time > nTimeBegin) {
-        throw JSONRPCError(RPC_WALLET_ERROR,
-                           "Rescan was unable to fully rescan the blockchain. "
-                           "Some transactions may be missing.");
-    }
+    RescanWallet(*pwallet, reserver, nTimeBegin, false /* update */);
     pwallet->MarkDirty();
 
     if (!fGood) {

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -56,8 +56,6 @@ static const bool DEFAULT_AVOIDPARTIALSPENDS = false;
 static const bool DEFAULT_WALLETBROADCAST = true;
 static const bool DEFAULT_DISABLE_WALLET = false;
 
-static const int64_t TIMESTAMP_MIN = 0;
-
 class CBlockIndex;
 class CChainParams;
 class CCoinControl;