From 471c063532087b86217fc954e53bf2c7d2c099a7 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Wed, 30 Oct 2024 10:10:55 -0500
Subject: [PATCH] Remove rescan specific threadpool (#5746)

---
 .../org/bitcoins/wallet/config/WalletAppConfig.scala  | 11 -----------
 .../org/bitcoins/wallet/internal/RescanHandling.scala |  5 ++---
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala b/wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala
index b2fe685286..dc0af32977 100644
--- a/wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala
+++ b/wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala
@@ -97,16 +97,6 @@ case class WalletAppConfig(
     )
   }
 
-  private lazy val rescanThreadFactory: ThreadFactory =
-    AsyncUtil.getNewThreadFactory("bitcoin-s-rescan")
-
-  /** Threads for rescanning the wallet */
-  private[wallet] lazy val rescanThreadPool: ExecutorService =
-    Executors.newFixedThreadPool(
-      Runtime.getRuntime.availableProcessors(),
-      rescanThreadFactory
-    )
-
   override lazy val callbackFactory: WalletCallbacks.type = WalletCallbacks
 
   lazy val kmConf: KeyManagerAppConfig =
@@ -280,7 +270,6 @@ case class WalletAppConfig(
       // in the future, we should actually cancel all things that are scheduled
       // manually, and then shutdown the scheduler
       scheduler.shutdownNow()
-      rescanThreadPool.shutdownNow()
       super.stop()
     }
 
diff --git a/wallet/src/main/scala/org/bitcoins/wallet/internal/RescanHandling.scala b/wallet/src/main/scala/org/bitcoins/wallet/internal/RescanHandling.scala
index dca064da63..5f5d991121 100644
--- a/wallet/src/main/scala/org/bitcoins/wallet/internal/RescanHandling.scala
+++ b/wallet/src/main/scala/org/bitcoins/wallet/internal/RescanHandling.scala
@@ -36,7 +36,7 @@ import org.bitcoins.wallet.models.{
 import org.bitcoins.wallet.WalletLogger
 
 import java.time.Instant
-import scala.concurrent.{ExecutionContext, Future, Promise}
+import scala.concurrent.{Future, Promise}
 import scala.util.{Failure, Success}
 
 case class RescanHandling(
@@ -50,8 +50,7 @@ case class RescanHandling(
     system: ActorSystem)
     extends RescanHandlingApi
     with WalletLogger {
-  private implicit val rescanEC: ExecutionContext =
-    ExecutionContext.fromExecutor(walletConfig.rescanThreadPool)
+  import system.dispatcher
   private def walletCallbacks: WalletCallbacks = walletConfig.callBacks
   private val stateDescriptorDAO: WalletStateDescriptorDAO =
     walletDAOs.stateDescriptorDAO