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

Move onHeaderRequestTimeout to PeerManager (#5056)

Browse source
This commit is contained in:
Chris Stewart 2023-04-23 13:38:15 -05:00 • committed by GitHub
parent 7beed5a00d
commit 1461782865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
node/src/main/scala/org/bitcoins/node/PeerManager.scala
View file

@ -14,6 +14,7 @@ import org.bitcoins.node.config.NodeAppConfig
import org.bitcoins.node.models.{Peer, PeerDAO, PeerDb}
import org.bitcoins.node.networking.peer._
import org.bitcoins.node.networking.P2PClientSupervisor
import org.bitcoins.node.networking.peer.DataMessageHandlerState._
import org.bitcoins.node.util.BitcoinSNodeUtil
import scodec.bits.ByteVector
@ -420,6 +421,27 @@ case class PeerManager(
Future.unit
}
private def onHeaderRequestTimeout(
peer: Peer,
state: DataMessageHandlerState): Future[DataMessageHandler] = {
logger.info(s"Header request timed out from $peer in state $state")
state match {
case HeaderSync =>
syncFromNewPeer()
case headerState @ ValidatingHeaders(_, failedCheck, _) =>
val newHeaderState = headerState.copy(failedCheck = failedCheck + peer)
val newDmh = node.getDataMessageHandler.copy(state = newHeaderState)
if (newHeaderState.validated) {
fetchCompactFilterHeaders(newDmh)
.map(_.copy(state = PostHeaderSync))
} else Future.successful(newDmh)
case PostHeaderSync => Future.successful(node.getDataMessageHandler)
}
}
def sendResponseTimeout(peer: Peer, payload: NetworkPayload): Future[Unit] = {
logger.debug(
s"Sending response timeout for ${payload.commandName} to $peer")
@ -454,10 +476,11 @@ case class PeerManager(
}
case msg @ HeaderTimeoutWrapper(peer) =>
logger.debug(s"Processing timeout header for $peer")
node.getDataMessageHandler.onHeaderRequestTimeout(peer).map { newDmh =>
node.updateDataMessageHandler(newDmh)
logger.debug(s"Done processing timeout header for $peer")
msg
onHeaderRequestTimeout(peer, node.getDataMessageHandler.state).map {
newDmh =>
node.updateDataMessageHandler(newDmh)
logger.debug(s"Done processing timeout header for $peer")
msg
}
}

20
node/src/main/scala/org/bitcoins/node/networking/peer/DataMessageHandler.scala
View file

@ -602,26 +602,6 @@ case class DataMessageHandler(
}
}
def onHeaderRequestTimeout(peer: Peer): Future[DataMessageHandler] = {
logger.info(s"Header request timed out from $peer in state $state")
state match {
case HeaderSync =>
peerManager.syncFromNewPeer()
case headerState @ ValidatingHeaders(_, failedCheck, _) =>
val newHeaderState = headerState.copy(failedCheck = failedCheck + peer)
val newDmh = copy(state = newHeaderState)
if (newHeaderState.validated) {
peerManager
.fetchCompactFilterHeaders(newDmh)
.map(_.copy(state = PostHeaderSync))
} else Future.successful(newDmh)
case PostHeaderSync => Future.successful(this)
}
}
private def sendNextGetCompactFilterHeadersCommand(
peerMsgSender: PeerMessageSender,
prevStopHash: DoubleSha256DigestBE): Future[Boolean] =