mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
style: apply clang format for new changes
This commit is contained in:
parent
f01338f607
commit
603061141f
@ -36,9 +36,7 @@ struct TestChainBRRBeforeActivationSetup : public TestChainSetup
|
|||||||
{
|
{
|
||||||
// Force fast DIP3 activation
|
// Force fast DIP3 activation
|
||||||
TestChainBRRBeforeActivationSetup() :
|
TestChainBRRBeforeActivationSetup() :
|
||||||
TestChainSetup(497, {"-dip3params=30:50",
|
TestChainSetup(497, {"-dip3params=30:50", "-testactivationheight=brr@1000", "-testactivationheight=v20@1200",
|
||||||
"-testactivationheight=brr@1000",
|
|
||||||
"-testactivationheight=v20@1200",
|
|
||||||
"-vbparams=mn_rr:0:999999999999:0:20:16:12:5:1"})
|
"-vbparams=mn_rr:0:999999999999:0:20:16:12:5:1"})
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -814,13 +814,14 @@ void FuncVerifyDB(TestChainSetup& setup)
|
|||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE(evo_dip3_activation_tests)
|
BOOST_AUTO_TEST_SUITE(evo_dip3_activation_tests)
|
||||||
|
|
||||||
struct TestChainDIP3BeforeActivationSetup : public TestChainSetup
|
struct TestChainDIP3BeforeActivationSetup : public TestChainSetup {
|
||||||
{
|
TestChainDIP3BeforeActivationSetup() :
|
||||||
TestChainDIP3BeforeActivationSetup() : TestChainSetup(430) {}
|
TestChainSetup(430)
|
||||||
|
{
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TestChainDIP3Setup : public TestChainDIP3BeforeActivationSetup
|
struct TestChainDIP3Setup : public TestChainDIP3BeforeActivationSetup {
|
||||||
{
|
|
||||||
TestChainDIP3Setup()
|
TestChainDIP3Setup()
|
||||||
{
|
{
|
||||||
// Activate DIP3 here
|
// Activate DIP3 here
|
||||||
@ -828,29 +829,31 @@ struct TestChainDIP3Setup : public TestChainDIP3BeforeActivationSetup
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TestChainV19BeforeActivationSetup : public TestChainSetup
|
struct TestChainV19BeforeActivationSetup : public TestChainSetup {
|
||||||
{
|
|
||||||
TestChainV19BeforeActivationSetup();
|
TestChainV19BeforeActivationSetup();
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TestChainV19Setup : public TestChainV19BeforeActivationSetup
|
struct TestChainV19Setup : public TestChainV19BeforeActivationSetup {
|
||||||
{
|
|
||||||
TestChainV19Setup()
|
TestChainV19Setup()
|
||||||
{
|
{
|
||||||
// Activate V19
|
// Activate V19
|
||||||
for (int i = 0; i < 5; ++i) {
|
for (int i = 0; i < 5; ++i) {
|
||||||
CreateAndProcessBlock({}, coinbaseKey);
|
CreateAndProcessBlock({}, coinbaseKey);
|
||||||
}
|
}
|
||||||
bool v19_just_activated{DeploymentActiveAfter(m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19) &&
|
bool v19_just_activated{DeploymentActiveAfter(m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(),
|
||||||
!DeploymentActiveAt(*m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
|
Consensus::DEPLOYMENT_V19) &&
|
||||||
|
!DeploymentActiveAt(*m_node.chainman->ActiveChain().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{DeploymentActiveAfter(m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
|
bool v19_active{DeploymentActiveAfter(m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(),
|
||||||
|
Consensus::DEPLOYMENT_V19)};
|
||||||
assert(!v19_active);
|
assert(!v19_active);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user