mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-19 23:03:45 +01:00
Merge bitcoin/bitcoin#30571: test: [refactor] Use m_rng directly
948238a683test: Remove FastRandomContext global (Ryan Ofsky)fa0fe08ecascripted-diff: [test] Use g_rng/m_rng directly (MarcoFalke)fa54cab473test: refactor: Accept any RandomNumberGenerator in RandMoney (MarcoFalke)68f77dd21etest: refactor: Pass rng parameters to test functions (Ryan Ofsky)fa19af555dtest: refactor: Move g_insecure_rand_ctx.Reseed out of the helper that calls MakeRandDeterministicDANGEROUS (MarcoFalke)3dc527f460test: refactor: Give unit test functions access to test state (Ryan Ofsky)fab023e177test: refactor: Make unsigned promotion explicit (MarcoFalke)fa2cb654ectest: Add m_rng alias for the global random context (MarcoFalke)fae7e3791ctest: Correct the random seed log on a prevector test failure (MarcoFalke) Pull request description: This is mostly a style-cleanup for the tests' random generation: 1) `g_insecure_rand_ctx` in the tests is problematic, because the name is a leftover when the generator was indeed insecure. However, now the generator is *deterministic*, because the seed is either passed in or printed (c.f. RANDOM_CTX_SEED). Stating that deterministic randomness is insecure in the tests seems redundant at best. Fix it by just using `m_rng` for the name. 2) The global random context has many one-line aliases, such as `InsecureRand32`. This is problematic, because the same line of code may use the context directly and through a wrapper at the same time. For example in net_tests (see below). This inconsistency is harmless, but confusing. Fix it by just removing the one-line aliases. ``` src/test/net_tests.cpp: auto msg_data_1 = g_insecure_rand_ctx.randbytes<uint8_t>(InsecureRandRange(100000)); ```` 3) The wrapper for randmoney has the same problem that the same unit test uses the context directly and through a wrapper at the same time. Also, it has a single type of Rng hardcoded. Fix it by accepting any type. ACKs for top commit: hodlinator: ACK948238a683ryanofsky: Code review ACK948238a683. Only changes since last review were changing a comments a little bit. marcofleon: Code review ACK948238a683. Only changes since my last review are the improvements in `prevector_tests`. Tree-SHA512: 69c6b46a42cb743138ee8c87ff26a588dbe083e3efb3dca49b8a133ba5d3b09e8bf01c590ec7e121a7d77cb1fd7dcacd927a9ca139ac65e1f7c6d1ec46f93b57
This commit is contained in:
@@ -341,13 +341,14 @@ void SatisfactionToWitness(miniscript::MiniscriptContext ctx, CScriptWitness& wi
|
||||
witness.stack.push_back(*builder.GetSpendData().scripts.begin()->second.begin());
|
||||
}
|
||||
|
||||
struct MiniScriptTest : BasicTestingSetup {
|
||||
/** Run random satisfaction tests. */
|
||||
void TestSatisfy(const KeyConverter& converter, const std::string& testcase, const NodeRef& node) {
|
||||
auto script = node->ToScript(converter);
|
||||
auto challenges = FindChallenges(node); // Find all challenges in the generated miniscript.
|
||||
std::vector<Challenge> challist(challenges.begin(), challenges.end());
|
||||
for (int iter = 0; iter < 3; ++iter) {
|
||||
std::shuffle(challist.begin(), challist.end(), g_insecure_rand_ctx);
|
||||
std::shuffle(challist.begin(), challist.end(), m_rng);
|
||||
Satisfier satisfier(converter.MsContext());
|
||||
TestSignatureChecker checker(satisfier);
|
||||
bool prev_mal_success = false, prev_nonmal_success = false;
|
||||
@@ -489,10 +490,11 @@ void Test(const std::string& ms, const std::string& hexscript, const std::string
|
||||
/*opslimit=*/-1, /*stacklimit=*/-1,
|
||||
/*max_wit_size=*/std::nullopt, /*max_tap_wit_size=*/std::nullopt, /*stack_exec=*/std::nullopt);
|
||||
}
|
||||
}; // struct MiniScriptTest
|
||||
|
||||
} // namespace
|
||||
|
||||
BOOST_FIXTURE_TEST_SUITE(miniscript_tests, BasicTestingSetup)
|
||||
BOOST_FIXTURE_TEST_SUITE(miniscript_tests, MiniScriptTest)
|
||||
|
||||
BOOST_AUTO_TEST_CASE(fixed_tests)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user