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/evo_deterministicmns_tests on llmq::utils

Browse Source
This commit is contained in:
Konstantin Akimov 2023-12-05 02:50:22 +07:00 committed by PastaPastaPasta
parent ad4d753bd7
commit 55abf7fa8d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/evo_deterministicmns_tests.cpp
View File

@ -7,6 +7,7 @@
#include <base58.h> #include <base58.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <deploymentstatus.h>
#include <messagesigner.h> #include <messagesigner.h>
#include <netbase.h> #include <netbase.h>
#include <policy/policy.h> #include <policy/policy.h>
@ -21,7 +22,6 @@
#include <evo/deterministicmns.h> #include <evo/deterministicmns.h>
#include <evo/providertx.h> #include <evo/providertx.h>
#include <evo/specialtx.h> #include <evo/specialtx.h>
#include <llmq/utils.h>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
@ -267,7 +267,7 @@ void FuncDIP3Activation(TestChainSetup& setup)
void FuncV19Activation(TestChainSetup& setup) void FuncV19Activation(TestChainSetup& setup)
{ {
BOOST_ASSERT(!llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(!DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
// create // create
auto utxos = BuildSimpleUtxoMap(setup.m_coinbase_txns); auto utxos = BuildSimpleUtxoMap(setup.m_coinbase_txns);
@ -283,7 +283,7 @@ void FuncV19Activation(TestChainSetup& setup)
auto block = std::make_shared<CBlock>(setup.CreateBlock({tx_reg}, setup.coinbaseKey)); auto block = std::make_shared<CBlock>(setup.CreateBlock({tx_reg}, setup.coinbaseKey));
BOOST_ASSERT(Assert(setup.m_node.chainman)->ProcessNewBlock(Params(), block, true, nullptr)); BOOST_ASSERT(Assert(setup.m_node.chainman)->ProcessNewBlock(Params(), block, true, nullptr));
BOOST_ASSERT(!llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(!DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
++nHeight; ++nHeight;
BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight); BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight);
deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip()); deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip());
@ -301,7 +301,7 @@ void FuncV19Activation(TestChainSetup& setup)
block = std::make_shared<CBlock>(setup.CreateBlock({tx_upreg}, setup.coinbaseKey)); block = std::make_shared<CBlock>(setup.CreateBlock({tx_upreg}, setup.coinbaseKey));
BOOST_ASSERT(Assert(setup.m_node.chainman)->ProcessNewBlock(Params(), block, true, nullptr)); BOOST_ASSERT(Assert(setup.m_node.chainman)->ProcessNewBlock(Params(), block, true, nullptr));
BOOST_ASSERT(!llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(!DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
++nHeight; ++nHeight;
BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight); BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight);
deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip()); deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip());
@ -321,7 +321,7 @@ void FuncV19Activation(TestChainSetup& setup)
BOOST_ASSERT(SignSignature(signing_provider, CTransaction(tx_reg), tx_spend, 0, SIGHASH_ALL)); BOOST_ASSERT(SignSignature(signing_provider, CTransaction(tx_reg), tx_spend, 0, SIGHASH_ALL));
block = std::make_shared<CBlock>(setup.CreateBlock({tx_spend}, setup.coinbaseKey)); block = std::make_shared<CBlock>(setup.CreateBlock({tx_spend}, setup.coinbaseKey));
BOOST_ASSERT(Assert(setup.m_node.chainman)->ProcessNewBlock(Params(), block, true, nullptr)); BOOST_ASSERT(Assert(setup.m_node.chainman)->ProcessNewBlock(Params(), block, true, nullptr));
BOOST_ASSERT(!llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(!DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
++nHeight; ++nHeight;
BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight); BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight);
deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip()); deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip());
@ -333,7 +333,7 @@ void FuncV19Activation(TestChainSetup& setup)
// mine another block so that it's not the last one before V19 // mine another block so that it's not the last one before V19
setup.CreateAndProcessBlock({}, setup.coinbaseKey); setup.CreateAndProcessBlock({}, setup.coinbaseKey);
BOOST_ASSERT(!llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(!DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
++nHeight; ++nHeight;
BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight); BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight);
deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip()); deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip());
@ -345,7 +345,7 @@ void FuncV19Activation(TestChainSetup& setup)
// this block should activate V19 // this block should activate V19
setup.CreateAndProcessBlock({}, setup.coinbaseKey); setup.CreateAndProcessBlock({}, setup.coinbaseKey);
BOOST_ASSERT(llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
++nHeight; ++nHeight;
BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight); BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight);
deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip()); deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip());
@ -365,7 +365,7 @@ void FuncV19Activation(TestChainSetup& setup)
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
setup.CreateAndProcessBlock({}, setup.coinbaseKey); setup.CreateAndProcessBlock({}, setup.coinbaseKey);
BOOST_ASSERT(llmq::utils::IsV19Active(::ChainActive().Tip())); BOOST_ASSERT(DeploymentActiveAfter(::ChainActive().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19));
BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight + 1 + i); BOOST_CHECK_EQUAL(::ChainActive().Height(), nHeight + 1 + i);
deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip()); deterministicMNManager->UpdatedBlockTip(::ChainActive().Tip());
deterministicMNManager->DoMaintenance(); deterministicMNManager->DoMaintenance();