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

Don't execute onResponseTimeout() when disconnecting (#5104)

Browse Source
This commit is contained in:
Chris Stewart 2023-06-14 15:49:20 -05:00 committed by GitHub
parent f4f45a1cad
commit dae8c0fc9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
node/src/main/scala/org/bitcoins/node/networking/peer/PeerMessageReceiverState.scala
View File

@ -204,7 +204,7 @@ sealed abstract class PeerMessageReceiverState extends Logging {
verackMsgP = good.verackMsgP)
val disconnectedPeer = DisconnectedPeer(peer, false)
queue.offer(disconnectedPeer).map(_ => newState)
case good: Normal =>
case good @ (_: Normal | _: Waiting) =>
logger.debug(s"Disconnected bitcoin peer=${peer}")
val newState = Disconnected(
clientConnectP = good.clientConnectP,
@ -216,30 +216,19 @@ sealed abstract class PeerMessageReceiverState extends Logging {
for {
_ <- queue.offer(disconnectedPeer).map(_ => newState)
} yield newState
case good @ (_: Initializing | _: Waiting) =>
val handleF: Future[Unit] = good match {
case wait: Waiting =>
onResponseTimeout(networkPayload = wait.responseFor,
peer = peer,
queue = queue)
.map(_ => ())
case wait: Initializing =>
wait.initializationTimeoutCancellable.cancel()
Future.unit
case _ => Future.unit
}
case initializing: Initializing =>
initializing.initializationTimeoutCancellable.cancel()
logger.debug(s"Disconnected bitcoin peer=${peer}")
val newState = Disconnected(
clientConnectP = good.clientConnectP,
clientDisconnectP = good.clientDisconnectP.success(()),
versionMsgP = good.versionMsgP,
verackMsgP = good.verackMsgP
clientConnectP = initializing.clientConnectP,
clientDisconnectP = initializing.clientDisconnectP.success(()),
versionMsgP = initializing.versionMsgP,
verackMsgP = initializing.verackMsgP
)
val disconnectedPeer = DisconnectedPeer(peer, false)
for {
_ <- handleF
_ <- queue.offer(disconnectedPeer)
} yield newState
}