Skip to content

Commit 6b87fa5

Browse files
committed
Merge bitcoin/bitcoin#25125: test: Slim down versionbits_tests.cpp
fae3200 test: Slim down versionbits_tests.cpp (MacroFake) Pull request description: Seems confusing to spin up a full chainman that isn't even used. Fix that by only spinning up logging. Also, remove the chainman include and comment. ACKs for top commit: fanquake: ACK fae3200 Tree-SHA512: 35261e9116c0c276f807453db3d635d83916ec2ffd99cf5641f8732736a30a542213096dcec550ef4522d97b3cafe384fdc6068138bc0b577c66fa61256719f8
2 parents b019cdc + fae3200 commit 6b87fa5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/test/versionbits_tests.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <chainparams.h>
77
#include <consensus/params.h>
88
#include <test/util/setup_common.h>
9-
#include <validation.h>
109
#include <versionbits.h>
1110

1211
#include <boost/test/unit_test.hpp>
@@ -183,7 +182,7 @@ class VersionBitsTester
183182
CBlockIndex* Tip() { return vpblock.empty() ? nullptr : vpblock.back(); }
184183
};
185184

186-
BOOST_FIXTURE_TEST_SUITE(versionbits_tests, TestingSetup)
185+
BOOST_FIXTURE_TEST_SUITE(versionbits_tests, BasicTestingSetup)
187186

188187
BOOST_AUTO_TEST_CASE(versionbits_test)
189188
{
@@ -413,7 +412,7 @@ static void check_computeblockversion(VersionBitsCache& versionbitscache, const
413412

414413
BOOST_AUTO_TEST_CASE(versionbits_computeblockversion)
415414
{
416-
VersionBitsCache vbcache; // don't use chainman versionbitscache since we want custom chain params
415+
VersionBitsCache vbcache;
417416

418417
// check that any deployment on any chain can conceivably reach both
419418
// ACTIVE and FAILED states in roughly the way we expect

0 commit comments

Comments
 (0)