mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-14 16:04:03 +02:00
Merge bitcoin/bitcoin#34858: test: Use NodeClockContext in more tests
faad08e59ctest: Use NodeClockContext in more tests (MarcoFalke)fa8fe0941efuzz: Use NodeClockContext (MarcoFalke)fa9f434df8test: Allow time_point in boost checks (MarcoFalke) Pull request description: Currently mocktime is written to a global, which may leak between sub-tests (albeit some tests try to reset the mocktime on a best-effort basis). Also, when advancing it, one has to keep a counter variable around. Fix both issues by using the recently added `NodeClockContext`, which resets the mocktime once it goes out of scope. Also, it has a method to advance the mocktime by a delta. ACKs for top commit: achow101: ACKfaad08e59cseduless: Tested ACKfaad08e59cfrankomosh: Tested ACKfaad08e59c. Ran all relevant tests, all clean. Also verified that the default-constructor call sites in orphanage_tests and addrman_tests behave identically to the explicit `{Now<NodeSeconds>()}` form. ryanofsky: Code review ACKfaad08e59cbut had a question about dropping +1 in one test below. Tree-SHA512: bd56931970eed02bfcf3f3593ef64a61a8a1d8cc8adf190d6903b35df0fd7e6d865678c7d5bd23ce53d074cb2cf53a0a19212fdeb593b047dac5561859bc86b0
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include <test/util/common.h>
|
||||
#include <test/util/random.h>
|
||||
#include <test/util/setup_common.h>
|
||||
#include <test/util/time.h>
|
||||
#include <test/util/transaction_utils.h>
|
||||
|
||||
#include <array>
|
||||
@@ -431,9 +432,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
|
||||
FillableSigningProvider keystore;
|
||||
BOOST_CHECK(keystore.AddKey(key));
|
||||
|
||||
// Freeze time for length of test
|
||||
auto now{GetTime<std::chrono::seconds>()};
|
||||
SetMockTime(now);
|
||||
NodeClockContext clock_ctx{};
|
||||
|
||||
std::vector<CTransactionRef> orphans_added;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user