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

Some cleanups in the node project (#4941)

Browse source
This commit is contained in:
Chris Stewart 2023-01-07 07:33:57 -06:00 • committed by GitHub
parent 8f4ed4ac83
commit 3a8eff8feb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testkit/src/main/scala/org/bitcoins/testkit/node/BaseNodeTest.scala
View file

@ -39,7 +39,7 @@ trait BaseNodeTest extends BitcoinSFixture with EmbeddedPg {
override def afterAll(): Unit = { override def afterAll(): Unit = {
super[EmbeddedPg].afterAll() super[EmbeddedPg].afterAll()
super.afterAll() super[BitcoinSFixture].afterAll()
} }
lazy val junkAddress: BitcoinAddress = lazy val junkAddress: BitcoinAddress =

6
testkit/src/main/scala/org/bitcoins/testkit/node/NodeTestWithCachedBitcoind.scala
View file

@ -6,7 +6,7 @@ import org.bitcoins.node.Node
import org.bitcoins.node.models.Peer import org.bitcoins.node.models.Peer
import org.bitcoins.rpc.client.common.BitcoindRpcClient import org.bitcoins.rpc.client.common.BitcoindRpcClient
import org.bitcoins.server.BitcoinSAppConfig import org.bitcoins.server.BitcoinSAppConfig
import org.bitcoins.testkit.node.NodeUnitTest.{createPeer, syncNeutrinoNode} import org.bitcoins.testkit.node.NodeUnitTest
import org.bitcoins.testkit.node.fixture.{ import org.bitcoins.testkit.node.fixture.{
NeutrinoNodeConnectedWithBitcoind, NeutrinoNodeConnectedWithBitcoind,
NeutrinoNodeConnectedWithBitcoinds NeutrinoNodeConnectedWithBitcoinds
@ -41,7 +41,7 @@ trait NodeTestWithCachedBitcoind extends BaseNodeTest with CachedTor {
NeutrinoNodeConnectedWithBitcoind] = { () => NeutrinoNodeConnectedWithBitcoind] = { () =>
require(appConfig.nodeConf.nodeType == NodeType.NeutrinoNode) require(appConfig.nodeConf.nodeType == NodeType.NeutrinoNode)
for { for {
peer <- createPeer(bitcoind) peer <- NodeUnitTest.createPeer(bitcoind)
node <- NodeUnitTest.createNeutrinoNode(peer, None)(system, node <- NodeUnitTest.createNeutrinoNode(peer, None)(system,
appConfig.chainConf, appConfig.chainConf,
appConfig.nodeConf) appConfig.nodeConf)
@ -95,7 +95,7 @@ trait NodeTestWithCachedBitcoind extends BaseNodeTest with CachedTor {
appConfig.chainConf, appConfig.chainConf,
appConfig.nodeConf) appConfig.nodeConf)
startedNode <- node.start() startedNode <- node.start()
syncedNode <- syncNeutrinoNode(startedNode, bitcoinds(0)) syncedNode <- NodeUnitTest.syncNeutrinoNode(startedNode, bitcoinds(0))
} yield NeutrinoNodeConnectedWithBitcoinds(syncedNode, bitcoinds) } yield NeutrinoNodeConnectedWithBitcoinds(syncedNode, bitcoinds)
} }
makeDependentFixture[NeutrinoNodeConnectedWithBitcoinds]( makeDependentFixture[NeutrinoNodeConnectedWithBitcoinds](

17
testkit/src/main/scala/org/bitcoins/testkit/node/NodeUnitTest.scala
View file

@ -18,11 +18,6 @@ import org.bitcoins.rpc.util.RpcUtil
import org.bitcoins.server.BitcoinSAppConfig import org.bitcoins.server.BitcoinSAppConfig
import org.bitcoins.testkit.chain.ChainUnitTest import org.bitcoins.testkit.chain.ChainUnitTest
import org.bitcoins.testkit.fixtures.BitcoinSFixture import org.bitcoins.testkit.fixtures.BitcoinSFixture
import org.bitcoins.testkit.node.NodeUnitTest.{
createPeer,
emptyPeer,
syncNeutrinoNode
}
import org.bitcoins.testkit.node.fixture._ import org.bitcoins.testkit.node.fixture._
import org.bitcoins.testkit.wallet.{BitcoinSWalletTest, WalletWithBitcoindRpc} import org.bitcoins.testkit.wallet.{BitcoinSWalletTest, WalletWithBitcoindRpc}
import org.bitcoins.wallet.WalletCallbacks import org.bitcoins.wallet.WalletCallbacks
@ -42,7 +37,7 @@ trait NodeUnitTest extends BaseNodeTest {
val nodeBuilder: () => Future[NeutrinoNode] = { () => val nodeBuilder: () => Future[NeutrinoNode] = { () =>
require(appConfig.nodeConf.nodeType == NodeType.NeutrinoNode) require(appConfig.nodeConf.nodeType == NodeType.NeutrinoNode)
for { for {
node <- NodeUnitTest.createNeutrinoNode(emptyPeer, None)( node <- NodeUnitTest.createNeutrinoNode(NodeUnitTest.emptyPeer, None)(
system, system,
appConfig.chainConf, appConfig.chainConf,
appConfig.nodeConf) appConfig.nodeConf)
@ -76,7 +71,7 @@ trait NodeUnitTest extends BaseNodeTest {
BitcoinSFixture BitcoinSFixture
.createBitcoindWithFunds(Some(V22)) .createBitcoindWithFunds(Some(V22))
.map(_.asInstanceOf[BitcoindV22RpcClient]) .map(_.asInstanceOf[BitcoindV22RpcClient])
peer <- createPeer(bitcoind) peer <- NodeUnitTest.createPeer(bitcoind)
node <- NodeUnitTest.createNeutrinoNode(peer, None)(system, node <- NodeUnitTest.createNeutrinoNode(peer, None)(system,
appConfig.chainConf, appConfig.chainConf,
appConfig.nodeConf) appConfig.nodeConf)
@ -107,7 +102,7 @@ trait NodeUnitTest extends BaseNodeTest {
appConfig.chainConf, appConfig.chainConf,
appConfig.nodeConf) appConfig.nodeConf)
startedNode <- node.start() startedNode <- node.start()
syncedNode <- syncNeutrinoNode(startedNode, bitcoind) syncedNode <- NodeUnitTest.syncNeutrinoNode(startedNode, bitcoind)
} yield NeutrinoNodeConnectedWithBitcoind(syncedNode, bitcoind) } yield NeutrinoNodeConnectedWithBitcoind(syncedNode, bitcoind)
} }
makeDependentFixture( makeDependentFixture(
@ -508,10 +503,12 @@ object NodeUnitTest extends P2PLogger {
import system.dispatcher import system.dispatcher
for { for {
syncing <- node.chainApiFromDb().flatMap(_.isSyncing()) syncing <- node.chainApiFromDb().flatMap(_.isSyncing())
_ = assert(!syncing) _ = require(
!syncing,
s"Cannot start syncing neutrino node when previous sync is ongoing")
_ <- node.sync() _ <- node.sync()
syncing <- node.chainApiFromDb().flatMap(_.isSyncing()) syncing <- node.chainApiFromDb().flatMap(_.isSyncing())
_ = assert(syncing) _ = require(syncing)
_ <- NodeTestUtil.awaitSync(node, bitcoind) _ <- NodeTestUtil.awaitSync(node, bitcoind)
_ <- AsyncUtil.retryUntilSatisfiedF( _ <- AsyncUtil.retryUntilSatisfiedF(
() => { () => {