From 1939e9fd2e1aaeae821ef71ee477e84a89699395 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Thu, 5 Sep 2024 08:48:33 -0500
Subject: [PATCH] core: Fix bug in RescanStarted.entireRescanDoneF (#5654)

---
 .../core/wallet/rescan/RescanState.scala      |  3 +--
 .../bitcoins/wallet/RescanHandlingTest.scala  | 26 +++----------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/core/src/main/scala/org/bitcoins/core/wallet/rescan/RescanState.scala b/core/src/main/scala/org/bitcoins/core/wallet/rescan/RescanState.scala
index 6441ed48da..3bff7f2bc0 100644
--- a/core/src/main/scala/org/bitcoins/core/wallet/rescan/RescanState.scala
+++ b/core/src/main/scala/org/bitcoins/core/wallet/rescan/RescanState.scala
@@ -76,7 +76,7 @@ object RescanState {
         b0 <- blocksMatchedF
         recursive <- recursiveRescanP.future
         b1 <- recursive match {
-          case r: RescanStarted => r.blocksMatchedF
+          case r: RescanStarted => r.entireRescanDoneF
           case RescanDone | RescanAlreadyStarted | RescanNotNeeded =>
             Future.successful(Vector.empty)
         }
@@ -170,5 +170,4 @@ object RescanState {
         }
     }
   }
-
 }
diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
index 5fd439aa8e..6e81fa940b 100644
--- a/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
+++ b/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
@@ -11,8 +11,6 @@ import org.bitcoins.testkit.wallet.{
   BitcoinSWalletTestCachedBitcoindNewest,
   WalletWithBitcoindRpc
 }
-
-import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
 
 class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
@@ -83,7 +81,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
           )
         rescanState <- wallet.fullRescanNeutrinoWallet(DEFAULT_ADDR_BATCH_SIZE)
         _ = assert(rescanState.isInstanceOf[RescanState.RescanStarted])
-        _ <- rescanState.asInstanceOf[RescanState.RescanStarted].blocksMatchedF
+        _ <- RescanState.awaitRescanDone(rescanState)
         balanceAfterRescan <- wallet.getBalance()
       } yield {
         assert(balanceAfterRescan == initBalance)
@@ -142,13 +140,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
           useCreationTime = false,
           force = false
         )
-        _ <- {
-          rescanState match {
-            case started: RescanState.RescanStarted =>
-              started.entireRescanDoneF
-            case _: RescanState => Future.unit
-          }
-        }
+        _ <- RescanState.awaitRescanDone(rescanState)
         balance <- wallet.getBalance()
         unconfirmedBalance <- wallet.getUnconfirmedBalance()
       } yield {
@@ -262,12 +254,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
           useCreationTime = true,
           force = false
         )
-        _ <- {
-          rescanState match {
-            case started: RescanState.RescanStarted => started.blocksMatchedF
-            case _: RescanState                     => Future.unit
-          }
-        }
+        _ <- RescanState.awaitRescanDone(rescanState)
         balance <- wallet.getBalance()
         unconfirmedBalance <- wallet.getUnconfirmedBalance()
       } yield {
@@ -311,12 +298,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
           useCreationTime = false,
           force = false
         )
-        _ <- {
-          rescanState match {
-            case started: RescanState.RescanStarted => started.blocksMatchedF
-            case _: RescanState                     => Future.unit
-          }
-        }
+        _ <- RescanState.awaitRescanDone(rescanState)
         balanceAfterRescan <- wallet.getBalance()
       } yield {
         assert(balanceAfterRescan == CurrencyUnits.zero)