diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index 677e4b0e4e..8ce8fe760b 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -464,14 +464,14 @@ CBlock getBlock13b8a() TestChainV19Setup::TestChainV19Setup() : TestChainSetup(899) { - bool v19_just_activated = llmq::utils::IsV19Active(::ChainActive().Tip()) && - !llmq::utils::IsV19Active(::ChainActive().Tip()->pprev); + bool v19_just_activated{DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19) && + !DeploymentActiveAt(*::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)}; assert(v19_just_activated); } // 5 blocks earlier TestChainV19BeforeActivationSetup::TestChainV19BeforeActivationSetup() : TestChainSetup(894) { - bool v19_active = llmq::utils::IsV19Active(::ChainActive().Tip()); + bool v19_active{DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)}; assert(!v19_active); }