test: Add RegTestingSetup to setup_common

MarcoFalke · MarcoFalke · commit fa0a731d007a · 2019-10-30T14:12:45.000-04:00
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
@@ -112,7 +112,7 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
     printer.header();
 
     for (const auto& p : benchmarks()) {
-        TestingSetup test{CBaseChainParams::REGTEST};
+        RegTestingSetup test{};
         {
             LOCK(cs_main);
             assert(::ChainActive().Height() == 0);
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
@@ -3,8 +3,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <blockencodings.h>
-#include <consensus/merkle.h>
 #include <chainparams.h>
+#include <consensus/merkle.h>
 #include <pow.h>
 #include <streams.h>
 
@@ -14,11 +14,7 @@
 
 std::vector<std::pair<uint256, CTransactionRef>> extra_txn;
 
-struct RegtestingSetup : public TestingSetup {
-    RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
-};
-
-BOOST_FIXTURE_TEST_SUITE(blockencodings_tests, RegtestingSetup)
+BOOST_FIXTURE_TEST_SUITE(blockencodings_tests, RegTestingSetup)
 
 static CBlock BuildBlockTestCase() {
     CBlock block;
diff --git a/src/test/setup_common.cpp b/src/test/setup_common.cpp
@@ -124,7 +124,7 @@ TestingSetup::~TestingSetup()
     pblocktree.reset();
 }
 
-TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
+TestChain100Setup::TestChain100Setup()
 {
     // CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests.
     // TODO: fix the code to support SegWit blocks.
diff --git a/src/test/setup_common.h b/src/test/setup_common.h
@@ -76,6 +76,12 @@ struct TestingSetup : public BasicTestingSetup {
     ~TestingSetup();
 };
 
+/** Identical to TestingSetup, but chain set to regtest */
+struct RegTestingSetup : public TestingSetup {
+    RegTestingSetup()
+        : TestingSetup{CBaseChainParams::REGTEST} {}
+};
+
 class CBlock;
 struct CMutableTransaction;
 class CScript;
@@ -84,7 +90,7 @@ class CScript;
 // Testing fixture that pre-creates a
 // 100-block REGTEST-mode block chain
 //
-struct TestChain100Setup : public TestingSetup {
+struct TestChain100Setup : public RegTestingSetup {
     TestChain100Setup();
 
     // Create a new block with just given transactions, coinbase paying to
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
@@ -18,13 +18,9 @@
 
 #include <thread>
 
-struct RegtestingSetup : public TestingSetup {
-    RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
-};
-
 static const std::vector<unsigned char> V_OP_TRUE{OP_TRUE};
 
-BOOST_FIXTURE_TEST_SUITE(validation_block_tests, RegtestingSetup)
+BOOST_FIXTURE_TEST_SUITE(validation_block_tests, RegTestingSetup)
 
 struct TestSubscriber : public CValidationInterface {
     uint256 m_expected_tip;

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double`
`112`	`112`	`printer.header();`
`113`	`113`
`114`	`114`	`for (const auto& p : benchmarks()) {`
`115`		`- TestingSetup test{CBaseChainParams::REGTEST};`
	`115`	`+ RegTestingSetup test{};`
`116`	`116`	`{`
`117`	`117`	`LOCK(cs_main);`
`118`	`118`	`assert(::ChainActive().Height() == 0);`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ TestingSetup::~TestingSetup()`
`124`	`124`	`pblocktree.reset();`
`125`	`125`	`}`
`126`	`126`
`127`		`-TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)`
	`127`	`+TestChain100Setup::TestChain100Setup()`
`128`	`128`	`{`
`129`	`129`	`// CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests.`
`130`	`130`	`// TODO: fix the code to support SegWit blocks.`