mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-24 06:57:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move where we call wallet.start() and node.start() to the same place to avoid initializaiton issue 1687 (#1689)

Browse source
This commit is contained in:
Chris Stewart 2020-07-21 12:04:29 -05:00 • committed by GitHub
parent 9a35f16913
commit 87e9a279c6
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/server/src/main/scala/org/bitcoins/server/Main.scala
View file

@ -84,7 +84,7 @@ object Main extends App with BitcoinSLogger {
}
//get our wallet
val walletF = for {
val configuredWalletF = for {
_ <- configInitializedF
uninitializedNode <- uninitializedNodeF
chainApi <- chainApiF
@ -93,30 +93,29 @@ object Main extends App with BitcoinSLogger {
chainApi,
BitcoinerLiveFeeRateProvider(60),
bip39PasswordOpt)
_ = logger.info("Starting wallet")
_ <- wallet.start()
} yield wallet
} yield {
logger.info(s"Done configuring wallet")
wallet
}
//add callbacks to our uninitialized node
val nodeWithCallbacksF = for {
val configuredNodeF = for {
uninitializedNode <- uninitializedNodeF
wallet <- walletF
wallet <- configuredWalletF
initNode <- addCallbacksAndBloomFilterToNode(uninitializedNode, wallet)
} yield initNode
//start and sync our node
val startedNodeF = for {
node <- nodeWithCallbacksF
_ <- node.start()
} yield node
} yield {
logger.info(s"Done configuring node")
initNode
}
//start our http server now that we are synced
val startFut = for {
node <- startedNodeF
wallet <- walletF
node <- configuredNodeF
wallet <- configuredWalletF
_ <- node.start()
_ <- wallet.start()
binding <- startHttpServer(node, wallet, rpcPortOpt)
_ =
_ = {
if (nodeConf.isSPVEnabled) {
logger.info(s"Starting SPV node sync")
} else if (nodeConf.isNeutrinoEnabled) {
@ -124,6 +123,7 @@ object Main extends App with BitcoinSLogger {
} else {
logger.info(s"Starting unknown type of node sync")
}
}
_ = BitcoinSServer.startedFP.success(Future.successful(binding))
_ <- node.sync()