mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-03 18:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove rescan specific threadpool (#5746)

Browse source
This commit is contained in:
Chris Stewart 2024-10-30 10:10:55 -05:00 • committed by GitHub
parent 835c98e5b9
commit 471c063532
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala
View file

@ -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 override lazy val callbackFactory: WalletCallbacks.type = WalletCallbacks
lazy val kmConf: KeyManagerAppConfig = lazy val kmConf: KeyManagerAppConfig =
@ -280,7 +270,6 @@ case class WalletAppConfig(
// in the future, we should actually cancel all things that are scheduled // in the future, we should actually cancel all things that are scheduled
// manually, and then shutdown the scheduler // manually, and then shutdown the scheduler
scheduler.shutdownNow() scheduler.shutdownNow()
rescanThreadPool.shutdownNow()
super.stop() super.stop()
} }

5
wallet/src/main/scala/org/bitcoins/wallet/internal/RescanHandling.scala
View file

@ -36,7 +36,7 @@ import org.bitcoins.wallet.models.{
import org.bitcoins.wallet.WalletLogger import org.bitcoins.wallet.WalletLogger
import java.time.Instant import java.time.Instant
import scala.concurrent.{ExecutionContext, Future, Promise} import scala.concurrent.{Future, Promise}
import scala.util.{Failure, Success} import scala.util.{Failure, Success}
case class RescanHandling( case class RescanHandling(
@ -50,8 +50,7 @@ case class RescanHandling(
system: ActorSystem) system: ActorSystem)
extends RescanHandlingApi extends RescanHandlingApi
with WalletLogger { with WalletLogger {
private implicit val rescanEC: ExecutionContext = import system.dispatcher
ExecutionContext.fromExecutor(walletConfig.rescanThreadPool)
private def walletCallbacks: WalletCallbacks = walletConfig.callBacks private def walletCallbacks: WalletCallbacks = walletConfig.callBacks
private val stateDescriptorDAO: WalletStateDescriptorDAO = private val stateDescriptorDAO: WalletStateDescriptorDAO =
walletDAOs.stateDescriptorDAO walletDAOs.stateDescriptorDAO