mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-20 10:13:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Speed up DataMessageHandlerTest dramatically by using CachedBitcoind (#5038)

Browse Source
This commit is contained in:
Chris Stewart 2023-04-07 11:12:06 -05:00 committed by GitHub
parent 36ec40dfa3
commit 31e1bd79e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
node-test/src/test/scala/org/bitcoins/node/networking/peer/DataMessageHandlerTest.scala
View File

@ -13,29 +13,36 @@ import org.bitcoins.node._
import org.bitcoins.node.networking.peer.DataMessageHandlerState.HeaderSync import org.bitcoins.node.networking.peer.DataMessageHandlerState.HeaderSync
import org.bitcoins.server.BitcoinSAppConfig import org.bitcoins.server.BitcoinSAppConfig
import org.bitcoins.testkit.BitcoinSTestAppConfig import org.bitcoins.testkit.BitcoinSTestAppConfig
import org.bitcoins.testkit.node.NodeUnitTest import org.bitcoins.testkit.node.{NodeTestWithCachedBitcoindNewest}
import org.bitcoins.testkit.node.fixture.NeutrinoNodeConnectedWithBitcoindV22 import org.bitcoins.testkit.node.fixture.{NeutrinoNodeConnectedWithBitcoind}
import org.bitcoins.testkit.tor.CachedTor import org.scalatest.{FutureOutcome, Outcome}
import org.scalatest.FutureOutcome
import scala.concurrent.duration.DurationInt import scala.concurrent.duration.DurationInt
import scala.concurrent.{Future, Promise} import scala.concurrent.{Future, Promise}
class DataMessageHandlerTest extends NodeUnitTest with CachedTor { class DataMessageHandlerTest extends NodeTestWithCachedBitcoindNewest {
/** Wallet config with data directory set to user temp directory */ /** Wallet config with data directory set to user temp directory */
override protected def getFreshConfig: BitcoinSAppConfig = override protected def getFreshConfig: BitcoinSAppConfig =
BitcoinSTestAppConfig.getNeutrinoWithEmbeddedDbTestConfig(pgUrl, BitcoinSTestAppConfig.getNeutrinoWithEmbeddedDbTestConfig(pgUrl,
Vector.empty) Vector.empty)
override type FixtureParam = NeutrinoNodeConnectedWithBitcoindV22 override type FixtureParam = NeutrinoNodeConnectedWithBitcoind
override def withFixture(test: OneArgAsyncTest): FutureOutcome = override def withFixture(test: OneArgAsyncTest): FutureOutcome = {
withNeutrinoNodeConnectedToBitcoindV22(test)(system, getFreshConfig) val outcome: Future[Outcome] = for {
bitcoind <- cachedBitcoindWithFundsF
outcome = withNeutrinoNodeConnectedToBitcoindCached(test, bitcoind)(
system,
getFreshConfig)
f <- outcome.toFuture
} yield f
new FutureOutcome(outcome)
}
it must "catch errors and not fail when processing an invalid payload" in { it must "catch errors and not fail when processing an invalid payload" in {
param: NeutrinoNodeConnectedWithBitcoindV22 => param: FixtureParam =>
val NeutrinoNodeConnectedWithBitcoindV22(node, _) = param val node = param.node
val peer = node.peerManager.peers.head val peer = node.peerManager.peers.head
val senderF = node.peerMsgSendersF.map(_.head) val senderF = node.peerMsgSendersF.map(_.head)
@ -67,7 +74,8 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
it must "verify OnBlockReceived callbacks are executed" in { it must "verify OnBlockReceived callbacks are executed" in {
param: FixtureParam => param: FixtureParam =>
val NeutrinoNodeConnectedWithBitcoindV22(node, bitcoind) = param val node = param.node
val bitcoind = param.bitcoind
val peer = node.peerManager.peers.head val peer = node.peerManager.peers.head
val resultP: Promise[Block] = Promise() val resultP: Promise[Block] = Promise()
@ -107,7 +115,8 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
it must "verify OnBlockHeadersReceived callbacks are executed" in { it must "verify OnBlockHeadersReceived callbacks are executed" in {
param: FixtureParam => param: FixtureParam =>
val NeutrinoNodeConnectedWithBitcoindV22(node, bitcoind) = param val node = param.node
val bitcoind = param.bitcoind
val peer = node.peerManager.peers.head val peer = node.peerManager.peers.head
val resultP: Promise[Vector[BlockHeader]] = Promise() val resultP: Promise[Vector[BlockHeader]] = Promise()
@ -150,7 +159,8 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
it must "verify OnCompactFilterReceived callbacks are executed" in { it must "verify OnCompactFilterReceived callbacks are executed" in {
param: FixtureParam => param: FixtureParam =>
val NeutrinoNodeConnectedWithBitcoindV22(node, bitcoind) = param val node = param.node
val bitcoind = param.bitcoind
val resultP: Promise[Vector[(DoubleSha256Digest, GolombFilter)]] = val resultP: Promise[Vector[(DoubleSha256Digest, GolombFilter)]] =
Promise() Promise()
@ -173,7 +183,8 @@ class DataMessageHandlerTest extends NodeUnitTest with CachedTor {
it must "verify OnTxReceived callbacks are executed" in { it must "verify OnTxReceived callbacks are executed" in {
param: FixtureParam => param: FixtureParam =>
val NeutrinoNodeConnectedWithBitcoindV22(node, bitcoind) = param val node = param.node
val bitcoind = param.bitcoind
val peer = node.peerManager.peers.head val peer = node.peerManager.peers.head
val resultP: Promise[Transaction] = Promise() val resultP: Promise[Transaction] = Promise()