From c422e37181cb1a3353df9184b39272bfe2429dd5 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Sat, 14 Sep 2024 20:18:31 +0700 Subject: [PATCH] style: apply clang format for new changes --- src/test/block_reward_reallocation_tests.cpp | 4 +-- src/test/evo_deterministicmns_tests.cpp | 29 +++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp index bdca7636419e3..4e9aa135f90ad 100644 --- a/src/test/block_reward_reallocation_tests.cpp +++ b/src/test/block_reward_reallocation_tests.cpp @@ -36,9 +36,7 @@ struct TestChainBRRBeforeActivationSetup : public TestChainSetup { // Force fast DIP3 activation TestChainBRRBeforeActivationSetup() : - TestChainSetup(497, {"-dip3params=30:50", - "-testactivationheight=brr@1000", - "-testactivationheight=v20@1200", + TestChainSetup(497, {"-dip3params=30:50", "-testactivationheight=brr@1000", "-testactivationheight=v20@1200", "-vbparams=mn_rr:0:999999999999:0:20:16:12:5:1"}) { } diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp index 71c89ff48187f..20ebfeea1f7bb 100644 --- a/src/test/evo_deterministicmns_tests.cpp +++ b/src/test/evo_deterministicmns_tests.cpp @@ -814,13 +814,14 @@ void FuncVerifyDB(TestChainSetup& setup) BOOST_AUTO_TEST_SUITE(evo_dip3_activation_tests) -struct TestChainDIP3BeforeActivationSetup : public TestChainSetup -{ - TestChainDIP3BeforeActivationSetup() : TestChainSetup(430) {} +struct TestChainDIP3BeforeActivationSetup : public TestChainSetup { + TestChainDIP3BeforeActivationSetup() : + TestChainSetup(430) + { + } }; -struct TestChainDIP3Setup : public TestChainDIP3BeforeActivationSetup -{ +struct TestChainDIP3Setup : public TestChainDIP3BeforeActivationSetup { TestChainDIP3Setup() { // Activate DIP3 here @@ -828,29 +829,31 @@ struct TestChainDIP3Setup : public TestChainDIP3BeforeActivationSetup } }; -struct TestChainV19BeforeActivationSetup : public TestChainSetup -{ +struct TestChainV19BeforeActivationSetup : public TestChainSetup { TestChainV19BeforeActivationSetup(); }; -struct TestChainV19Setup : public TestChainV19BeforeActivationSetup -{ +struct TestChainV19Setup : public TestChainV19BeforeActivationSetup { TestChainV19Setup() { // Activate V19 for (int i = 0; i < 5; ++i) { CreateAndProcessBlock({}, coinbaseKey); } - bool v19_just_activated{DeploymentActiveAfter(m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19) && - !DeploymentActiveAt(*m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)}; + bool v19_just_activated{DeploymentActiveAfter(m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), + Consensus::DEPLOYMENT_V19) && + !DeploymentActiveAt(*m_node.chainman->ActiveChain().Tip(), Params().GetConsensus(), + Consensus::DEPLOYMENT_V19)}; assert(v19_just_activated); } }; // 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); }