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

Improve ReConnectionTest (#5323)

Browse Source 
* Improve ReconnectionTest

* Await sync before starting our inactivity check
This commit is contained in:
Chris Stewart 2023-12-13 06:25:24 -06:00 committed by GitHub
parent f4db40897b
commit 7f337073c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
node-test/src/test/scala/org/bitcoins/node/networking/ReConnectionTest.scala
View File

@ -13,7 +13,7 @@ import org.bitcoins.testkit.node.{
import org.scalatest.FutureOutcome
import scala.concurrent.Future
import scala.concurrent.duration.DurationInt
import scala.concurrent.duration.{DurationInt, FiniteDuration}
class ReConnectionTest extends NodeTestWithCachedBitcoindNewest {
@ -61,16 +61,21 @@ class ReConnectionTest extends NodeTestWithCachedBitcoindNewest {
it must "disconnect a peer after a period of inactivity" in {
nodeConnectedWithBitcoind: NeutrinoNodeConnectedWithBitcoind =>
val bitcoind = nodeConnectedWithBitcoind.bitcoind
val timeout = 5.seconds
val startedF =
getSmallInactivityCheckNeutrinoNode(nodeConnectedWithBitcoind.node)
getSmallInactivityCheckNeutrinoNode(nodeConnectedWithBitcoind.node,
timeout)
for {
started <- startedF
_ <- AsyncUtil.retryUntilSatisfiedF(() =>
started.getConnectionCount.map(_ == 1))
//let sync occur so we aren't receiving blockchain data over the network
_ <- NodeTestUtil.awaitAllSync(started, bitcoind)
//wait until there is a timeout for inactivity
_ <- AsyncUtil.retryUntilSatisfiedF(
() => started.getConnectionCount.map(_ == 0),
1.second)
_ <- AsyncUtil.nonBlockingSleep(timeout)
_ <- AsyncUtil.retryUntilSatisfiedF(() =>
started.getConnectionCount.map(_ == 0))
_ <- started.stop()
_ <- started.nodeConfig.stop()
} yield {
@ -82,8 +87,10 @@ class ReConnectionTest extends NodeTestWithCachedBitcoindNewest {
nodeConnectedWithBitcoind: NeutrinoNodeConnectedWithBitcoind =>
//see: https://github.com/bitcoin-s/bitcoin-s/issues/5162
val bitcoind = nodeConnectedWithBitcoind.bitcoind
val timeout = 5.second
val startedF =
getSmallInactivityCheckNeutrinoNode(nodeConnectedWithBitcoind.node)
getSmallInactivityCheckNeutrinoNode(nodeConnectedWithBitcoind.node,
timeout)
for {
started <- startedF
_ <- AsyncUtil.retryUntilSatisfiedF(() =>
@ -108,12 +115,14 @@ class ReConnectionTest extends NodeTestWithCachedBitcoindNewest {
}
private def getSmallInactivityCheckNeutrinoNode(
initNode: NeutrinoNode): Future[NeutrinoNode] = {
initNode: NeutrinoNode,
timeout: FiniteDuration): Future[NeutrinoNode] = {
//make a custom config, set the inactivity timeout very low
//so we will disconnect our peer organically
val config =
ConfigFactory.parseString("bitcoin-s.node.inactivity-timeout=5s")
ConfigFactory.parseString(
s"bitcoin-s.node.inactivity-timeout=${timeout.toString}")
val stoppedConfigF = initNode.nodeConfig.stop()
val newNodeAppConfigF =
stoppedConfigF.map(_ => initNode.nodeConfig.withOverrides(config))