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

Skip downloadBlocks if given an empty Vector (#1690)

Browse source
This commit is contained in:
Ben Carman 2020-07-21 13:59:07 -05:00 • committed by GitHub
parent 87e9a279c6
commit 5c9cbbdfc1
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ import org.bitcoins.chain.models.{
import org.bitcoins.core.api.{ChainQueryApi, NodeApi}
import org.bitcoins.core.p2p.{NetworkPayload, TypeIdentifier}
import org.bitcoins.core.protocol.transaction.Transaction
import org.bitcoins.core.util.Mutable
import org.bitcoins.core.util.{FutureUtil, Mutable}
import org.bitcoins.crypto.{DoubleSha256Digest, DoubleSha256DigestBE}
import org.bitcoins.node.config.NodeAppConfig
import org.bitcoins.node.models.{
@ -229,11 +229,15 @@ trait Node extends NodeApi with ChainQueryApi with P2PLogger {
*/
override def downloadBlocks(
blockHashes: Vector[DoubleSha256Digest]): Future[Unit] = {
for {
peerMsgSender <- peerMsgSenderF
_ <- peerMsgSender.sendGetDataMessage(TypeIdentifier.MsgBlock,
blockHashes: _*)
} yield ()
if (blockHashes.isEmpty) {
FutureUtil.unit
} else {
for {
peerMsgSender <- peerMsgSenderF
_ <- peerMsgSender.sendGetDataMessage(TypeIdentifier.MsgBlock,
blockHashes: _*)
} yield ()
}
}
/** Gets the height of the given block */

5
wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala
View file

@ -95,7 +95,10 @@ abstract class Wallet
utxos <- utxosWithMissingTx
blockHashes = utxos.flatMap(_.blockHash.map(_.flip))
// Download the block the tx is from so we process the block and subsequent txs
_ <- nodeApi.downloadBlocks(blockHashes.distinct)
_ <-
if (blockHashes.nonEmpty) {
nodeApi.downloadBlocks(blockHashes.distinct)
} else FutureUtil.unit
} yield ()
override def start(): Future[Unit] = {