From a124280dfb878f2c0ee71b55c6824fd23129e688 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 16 May 2023 22:11:51 +0300 Subject: [PATCH 1/2] merge bitcoin#19775: Activate segwit in TestChain100Setup --- src/test/util/setup_common.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index 83496dc8e02e..a0ee3bfe581d 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -261,11 +261,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector blocks before activating it in these tests. - //gArgs.ForceSetArg("-vbparams", strprintf("deployment_name:0:%d", (int64_t)Consensus::BIP9Deployment::NO_TIMEOUT)); - // Need to recreate chainparams - SelectParams(CBaseChainParams::REGTEST); - // Generate a 100-block chain: coinbaseKey.MakeNewKey(true); CScript scriptPubKey = CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG; From f2ac8c4afaa4b0be6aa46a9b0abc0b3feaacca72 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 17 May 2023 01:44:44 +0300 Subject: [PATCH 2/2] fix(tests): pass extra_args instead of setting them via ForceSetArg --- src/test/block_reward_reallocation_tests.cpp | 9 ++------- src/test/dynamic_activation_thresholds_tests.cpp | 5 +---- src/test/util/setup_common.cpp | 3 ++- src/test/util/setup_common.h | 6 +++--- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp index 9ea366407059..17a910b979ab 100644 --- a/src/test/block_reward_reallocation_tests.cpp +++ b/src/test/block_reward_reallocation_tests.cpp @@ -40,13 +40,8 @@ const int window{500}, th_start{400}, th_end{300}; struct TestChainBRRBeforeActivationSetup : public TestChainSetup { - TestChainBRRBeforeActivationSetup() : TestChainSetup(497) - { - // Force fast DIP3 activation - gArgs.ForceSetArg("-dip3params", "30:50"); - SelectParams(CBaseChainParams::REGTEST); - gArgs.ForceRemoveArg("dip3params"); - } + // Force fast DIP3 activation + TestChainBRRBeforeActivationSetup() : TestChainSetup(497, {"-dip3params=30:50"}) {} }; static SimpleUTXOMap BuildSimpleUtxoMap(const std::vector& txs) diff --git a/src/test/dynamic_activation_thresholds_tests.cpp b/src/test/dynamic_activation_thresholds_tests.cpp index 0692256f9f0c..9d9b5cfe4fcf 100644 --- a/src/test/dynamic_activation_thresholds_tests.cpp +++ b/src/test/dynamic_activation_thresholds_tests.cpp @@ -34,10 +34,7 @@ static constexpr int threshold(int attempt) struct TestChainDATSetup : public TestChainSetup { - TestChainDATSetup() : TestChainSetup(window - 2) { - gArgs.ForceSetArg("-vbparams","testdummy:0:999999999999:100:80:60:5"); - SelectParams(CBaseChainParams::REGTEST); - } + TestChainDATSetup() : TestChainSetup(window - 2, {"-vbparams=testdummy:0:999999999999:100:80:60:5"}) {} void signal(int num_blocks, bool expected_lockin) { diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index a0ee3bfe581d..cd4a36f9ed3a 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -259,7 +259,8 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector& extra_args) + : RegTestingSetup(extra_args) { // Generate a 100-block chain: coinbaseKey.MakeNewKey(true); diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h index d69dd73dbd4d..bd9a41a53371 100644 --- a/src/test/util/setup_common.h +++ b/src/test/util/setup_common.h @@ -102,8 +102,8 @@ struct TestingSetup : public ChainTestingSetup { /** Identical to TestingSetup, but chain set to regtest */ struct RegTestingSetup : public TestingSetup { - RegTestingSetup() - : TestingSetup{CBaseChainParams::REGTEST} {} + RegTestingSetup(const std::vector& extra_args = {}) + : TestingSetup{CBaseChainParams::REGTEST, extra_args} {} }; class CBlock; @@ -112,7 +112,7 @@ class CScript; struct TestChainSetup : public RegTestingSetup { - TestChainSetup(int blockCount); + TestChainSetup(int blockCount, const std::vector& extra_args = {}); ~TestChainSetup(); /**