sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 20:42:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: drop dependency test/util/setup_common on llmq/utils

Browse Source
This commit is contained in:
Konstantin Akimov 2023-12-05 02:25:57 +07:00 committed by PastaPastaPasta
parent c4d634c051
commit 39dc612eee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/util/setup_common.cpp
View File

@ -10,6 +10,7 @@
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/params.h> #include <consensus/params.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <deploymentstatus.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <flat-database.h> #include <flat-database.h>
#include <governance/governance.h> #include <governance/governance.h>
@ -27,7 +28,6 @@
#include <llmq/signing.h> #include <llmq/signing.h>
#include <llmq/signing_shares.h> #include <llmq/signing_shares.h>
#include <llmq/snapshot.h> #include <llmq/snapshot.h>
#include <llmq/utils.h>
#include <masternode/sync.h> #include <masternode/sync.h>
#include <miner.h> #include <miner.h>
#include <net.h> #include <net.h>
@ -464,14 +464,14 @@ CBlock getBlock13b8a()
TestChainV19Setup::TestChainV19Setup() : TestChainSetup(899) TestChainV19Setup::TestChainV19Setup() : TestChainSetup(899)
{ {
bool v19_just_activated = llmq::utils::IsV19Active(::ChainActive().Tip()) && bool v19_just_activated{DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19) &&
!llmq::utils::IsV19Active(::ChainActive().Tip()->pprev); !DeploymentActiveAt(*::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
assert(v19_just_activated); assert(v19_just_activated);
} }
// 5 blocks earlier // 5 blocks earlier
TestChainV19BeforeActivationSetup::TestChainV19BeforeActivationSetup() : TestChainSetup(894) 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); assert(!v19_active);
} }