Skip to content

Commit cf26ca3

Browse files
committed
Merge #21081: test: fix the unreachable code at feature_taproot
5e0cd25 fix the unreachable code at feature_taproot (Bruno Garcia) Pull request description: This PR removes the unnecessary return statement at the beginning of the function that makes the rest of the function unreachable. ACKs for top commit: practicalswift: cr ACK 5e0cd25: patch looks correct! sipa: ACK 5e0cd25. theStack: Tested ACK 5e0cd25 🏔️ sanket1729: tACK 5e0cd25. I noted this a while ago while fixing feature_taproot.py for elements. Verified that the extreme ranges of CScriptNum are correct and the overflow case for `CHECKSIGADD` works as intended. Adding 1 to 2^31 - 1 results in an overflow, but the interpreter puts a `vch` of corresponding to 2^31 on stack. Even though it cannot be converted to CscriptNum(restricted to 4 bytes), it's result can still be compared by OP_EQUAL. Tree-SHA512: fff9be3be94f4b3f3ccf24bf588d96e84d14806f82692dccd31631b0e5c79a7575a96c308cb5a4f610ab02e2f854b899f374437c33ecf6d52055d333f2de9b27
2 parents 1815847 + 5e0cd25 commit cf26ca3

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

test/functional/feature_taproot.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ def add_spender(spenders, *args, **kwargs):
517517

518518
def random_checksig_style(pubkey):
519519
"""Creates a random CHECKSIG* tapscript that would succeed with only the valid signature on witness stack."""
520-
return bytes(CScript([pubkey, OP_CHECKSIG]))
521520
opcode = random.choice([OP_CHECKSIG, OP_CHECKSIGVERIFY, OP_CHECKSIGADD])
522521
if (opcode == OP_CHECKSIGVERIFY):
523522
ret = CScript([pubkey, opcode, OP_1])

0 commit comments

Comments
 (0)