From e9edb78955ce9280d224f3079f7d4bc67552d854 Mon Sep 17 00:00:00 2001 From: ivanlele Date: Tue, 17 Mar 2026 16:49:38 +0000 Subject: [PATCH] Adjust test flag selection in ValidateCheckInputsForAllFlags to accommodate Elements-specific flags --- src/test/txvalidationcache_tests.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp index d3c55da2e1..ddd88f33d9 100644 --- a/src/test/txvalidationcache_tests.cpp +++ b/src/test/txvalidationcache_tests.cpp @@ -131,13 +131,9 @@ static void ValidateCheckInputsForAllFlags(const CTransaction &tx, uint32_t fail TxValidationState state; // Randomly selects flag combinations - // - // ELEMENTS - // Upstream bitcoin uses SCRIPT_VERIFY_END_MARKER, but this will break the bitcoin tests, because - // of some extra elements flags that have been added. - // SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE is the highest non-elements flag. - // FIXME: Adjust this test to work with the extra elements flags. - uint32_t test_flags = (uint32_t) insecure_rand.randrange((SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE - 1) << 1); + uint32_t test_flags = (uint32_t) insecure_rand.randrange((SCRIPT_VERIFY_END_MARKER - 1) << 1); + // ELEMENTS: Turn off non-standard Bitcoin flags + test_flags &= ~(SCRIPT_NO_SIGHASH_BYTE | SCRIPT_SIGHASH_RANGEPROOF | SCRIPT_VERIFY_SIMPLICITY); // Filter out incompatible flag choices if ((test_flags & SCRIPT_VERIFY_CLEANSTACK)) {