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

Remove default parameters from DataMessageHandler (#4918)

Browse source 
* Remove default parameters from DataMessageHandler

* Remove syncPeer default parameter
This commit is contained in:
Chris Stewart 2022-12-12 15:46:34 -06:00 • committed by GitHub
parent 424ea33541
commit aab2b274f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 82 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
node-test/src/test/scala/org/bitcoins/node/networking/peer/DataMessageHandlerTest.scala
View file

@ -38,14 +38,18 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
val senderF = node.peerMsgSenders(0) val senderF = node.peerMsgSenders(0)
for { for {
chainApi <- node.chainApiFromDb() chainApi <- node.chainApiFromDb()
dataMessageHandler = DataMessageHandler(chainApi, dataMessageHandler = DataMessageHandler(
None, chainApi = chainApi,
node, walletCreationTimeOpt = None,
HeaderSync, node = node,
syncPeer = Some(peer))( state = HeaderSync,
node.executionContext, initialSyncDone = None,
node.nodeAppConfig, currentFilterBatch = Vector.empty,
node.chainConfig) filterHeaderHeightOpt = None,
filterHeightOpt = None,
syncing = true,
syncPeer = Some(peer)
)(node.executionContext, node.nodeAppConfig, node.chainConfig)
// Use signet genesis block header, this should be invalid for regtest // Use signet genesis block header, this should be invalid for regtest
invalidPayload = invalidPayload =
@ -86,13 +90,18 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
_ = node.nodeAppConfig.addCallbacks(nodeCallbacks) _ = node.nodeAppConfig.addCallbacks(nodeCallbacks)
dataMessageHandler = dataMessageHandler =
DataMessageHandler(genesisChainApi, DataMessageHandler(
None, chainApi = genesisChainApi,
node, walletCreationTimeOpt = None,
HeaderSync, node = node,
syncPeer = Some(peer))(node.executionContext, state = HeaderSync,
node.nodeAppConfig, initialSyncDone = None,
node.chainConfig) currentFilterBatch = Vector.empty,
filterHeaderHeightOpt = None,
filterHeightOpt = None,
syncing = true,
syncPeer = Some(peer)
)(node.executionContext, node.nodeAppConfig, node.chainConfig)
sender <- senderF sender <- senderF
_ <- dataMessageHandler.handleDataPayload(payload, sender, peer) _ <- dataMessageHandler.handleDataPayload(payload, sender, peer)
result <- resultP.future result <- resultP.future
@ -126,13 +135,18 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
_ = node.nodeAppConfig.addCallbacks(callbacks) _ = node.nodeAppConfig.addCallbacks(callbacks)
dataMessageHandler = dataMessageHandler =
DataMessageHandler(genesisChainApi, DataMessageHandler(
None, chainApi = genesisChainApi,
node, walletCreationTimeOpt = None,
HeaderSync, node = node,
syncPeer = Some(peer))(node.executionContext, state = HeaderSync,
node.nodeAppConfig, initialSyncDone = None,
node.chainConfig) currentFilterBatch = Vector.empty,
filterHeaderHeightOpt = None,
filterHeightOpt = None,
syncing = true,
syncPeer = Some(peer)
)(node.executionContext, node.nodeAppConfig, node.chainConfig)
sender <- senderF sender <- senderF
_ <- dataMessageHandler.handleDataPayload(payload, sender, peer) _ <- dataMessageHandler.handleDataPayload(payload, sender, peer)
result <- resultP.future result <- resultP.future
@ -164,13 +178,18 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
nodeCallbacks = NodeCallbacks.onCompactFilterReceived(callback) nodeCallbacks = NodeCallbacks.onCompactFilterReceived(callback)
_ = node.nodeAppConfig.addCallbacks(nodeCallbacks) _ = node.nodeAppConfig.addCallbacks(nodeCallbacks)
dataMessageHandler = dataMessageHandler =
DataMessageHandler(genesisChainApi, DataMessageHandler(
None, chainApi = genesisChainApi,
node, walletCreationTimeOpt = None,
HeaderSync, node = node,
syncPeer = Some(peer))(node.executionContext, state = HeaderSync,
node.nodeAppConfig, initialSyncDone = None,
node.chainConfig) currentFilterBatch = Vector.empty,
filterHeaderHeightOpt = None,
filterHeightOpt = None,
syncing = true,
syncPeer = Some(peer)
)(node.executionContext, node.nodeAppConfig, node.chainConfig)
sender <- senderF sender <- senderF
_ <- dataMessageHandler.handleDataPayload(payload, sender, peer) _ <- dataMessageHandler.handleDataPayload(payload, sender, peer)
result <- resultP.future result <- resultP.future
@ -203,13 +222,18 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
_ = node.nodeAppConfig.addCallbacks(nodeCallbacks) _ = node.nodeAppConfig.addCallbacks(nodeCallbacks)
dataMessageHandler = dataMessageHandler =
DataMessageHandler(genesisChainApi, DataMessageHandler(
None, chainApi = genesisChainApi,
node, walletCreationTimeOpt = None,
HeaderSync, node = node,
syncPeer = Some(peer))(node.executionContext, state = HeaderSync,
node.nodeAppConfig, initialSyncDone = None,
node.chainConfig) currentFilterBatch = Vector.empty,
filterHeaderHeightOpt = None,
filterHeightOpt = None,
syncing = true,
syncPeer = Some(peer)
)(node.executionContext, node.nodeAppConfig, node.chainConfig)
sender <- senderF sender <- senderF
_ <- dataMessageHandler.handleDataPayload(payload, sender, peer) _ <- dataMessageHandler.handleDataPayload(payload, sender, peer)
result <- resultP.future result <- resultP.future

19
node/src/main/scala/org/bitcoins/node/NeutrinoNode.scala
View file

@ -1,5 +1,6 @@
package org.bitcoins.node package org.bitcoins.node
import akka.Done
import akka.actor.ActorSystem import akka.actor.ActorSystem
import org.bitcoins.chain.config.ChainAppConfig import org.bitcoins.chain.config.ChainAppConfig
import org.bitcoins.chain.models.BlockHeaderDAO import org.bitcoins.chain.models.BlockHeaderDAO
@ -22,7 +23,7 @@ import org.bitcoins.node.networking.peer.{
} }
import java.time.Instant import java.time.Instant
import scala.concurrent.Future import scala.concurrent.{Future, Promise}
case class NeutrinoNode( case class NeutrinoNode(
chainApi: ChainApi, chainApi: ChainApi,
@ -44,8 +45,20 @@ case class NeutrinoNode(
val controlMessageHandler: ControlMessageHandler = ControlMessageHandler(this) val controlMessageHandler: ControlMessageHandler = ControlMessageHandler(this)
private var dataMessageHandler: DataMessageHandler = private var dataMessageHandler: DataMessageHandler = {
DataMessageHandler(chainApi, walletCreationTimeOpt, this, HeaderSync) DataMessageHandler(
chainApi = chainApi,
walletCreationTimeOpt = walletCreationTimeOpt,
node = this,
state = HeaderSync,
initialSyncDone = Some(Promise[Done]()),
currentFilterBatch = Vector.empty,
filterHeaderHeightOpt = None,
filterHeightOpt = None,
syncing = false,
syncPeer = None
)
}
override def getDataMessageHandler: DataMessageHandler = dataMessageHandler override def getDataMessageHandler: DataMessageHandler = dataMessageHandler

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

@ -32,12 +32,12 @@ case class DataMessageHandler(
walletCreationTimeOpt: Option[Instant], walletCreationTimeOpt: Option[Instant],
node: Node, node: Node,
state: DataMessageHandlerState, state: DataMessageHandlerState,
initialSyncDone: Option[Promise[Done]] = None, initialSyncDone: Option[Promise[Done]],
currentFilterBatch: Vector[CompactFilterMessage] = Vector.empty, currentFilterBatch: Vector[CompactFilterMessage],
filterHeaderHeightOpt: Option[Int] = None, filterHeaderHeightOpt: Option[Int],
filterHeightOpt: Option[Int] = None, filterHeightOpt: Option[Int],
syncing: Boolean = false, syncing: Boolean,
syncPeer: Option[Peer] = None)(implicit syncPeer: Option[Peer])(implicit
ec: ExecutionContext, ec: ExecutionContext,
appConfig: NodeAppConfig, appConfig: NodeAppConfig,
chainConfig: ChainAppConfig) chainConfig: ChainAppConfig)