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

Remove downloadBlocksBasedOnIBD() as it is redundant (#5099)

Browse source
This commit is contained in:
Chris Stewart 2023-06-08 16:10:04 -05:00 • committed by GitHub
parent ae8c97a4d1
commit a5778948cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
node/src/main/scala/org/bitcoins/node/Node.scala
View file

@ -16,12 +16,6 @@ import org.bitcoins.core.protocol.transaction.Transaction
import org.bitcoins.crypto.{DoubleSha256Digest, DoubleSha256DigestBE}
import org.bitcoins.node.config.NodeAppConfig
import org.bitcoins.node.models._
import org.bitcoins.node.networking.peer.DataMessageHandlerState.{
DoneSyncing,
MisbehavingPeer,
RemovePeers
}
import org.bitcoins.node.networking.peer.SyncDataMessageHandlerState
import scala.concurrent.{ExecutionContext, Future}
import scala.util.{Failure, Success}
@ -165,43 +159,14 @@ trait Node extends NodeApi with ChainQueryApi with P2PLogger {
Future.unit
} else {
for {
chainApi <- chainApiFromDb()
isIBD <- chainApi.isIBD()
_ <- downloadBlocksBasedOnIBD(isIBD, blockHashes)
_ <- peerManager.sendGetDataMessages(typeIdentifier =
TypeIdentifier.MsgWitnessBlock,
hashes = blockHashes.map(_.flip),
peerOpt = None)
} yield ()
}
}
/** Helper method to download blocks.
* If our node is in IBD, we will only download only from our peer we are doing IBD with.
* If we are not in IBD, we will download from a random peer.
*/
private def downloadBlocksBasedOnIBD(
isIBD: Boolean,
blockHashes: Vector[DoubleSha256Digest]): Future[Unit] = {
if (isIBD) {
val syncPeerOpt = peerManager.getDataMessageHandler.state match {
case state: SyncDataMessageHandlerState => Some(state.syncPeer)
case DoneSyncing | _: MisbehavingPeer | _: RemovePeers => None
}
syncPeerOpt match {
case Some(peer) =>
peerManager.sendGetDataMessages(typeIdentifier =
TypeIdentifier.MsgWitnessBlock,
hashes = blockHashes.map(_.flip),
peerOpt = Some(peer))
case None =>
throw new RuntimeException(
"IBD not started yet. Cannot query for blocks.")
}
} else {
peerManager.sendGetDataMessages(typeIdentifier =
TypeIdentifier.MsgWitnessBlock,
hashes = blockHashes.map(_.flip),
peerOpt = None)
}
}
override def getConnectionCount: Future[Int] = {
Future.successful(peerManager.connectedPeerCount)
}