Skip to content

Commit 3c5fb96

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#26007: [contrib] message-capture-parser: fix AssertionError on parsing headers message
644772b message-capture-parser: fix AssertionError on parsing `headers` message (Sebastian Falbesoner) Pull request description: If a test framework message's field name is in the list of `HASH_INT_VECTORS`, we currently assume that it _always_ has to contain a vector of integers and throw otherwise: https://github.com/bitcoin/bitcoin/blob/0ebd4db32b39cb7c505148f090df4b7ac778c307/contrib/message-capture/message-capture-parser.py#L82-L83 (introduced in PR #25367, commit 42bbbba). However, that assumption is too strict. The (de)serialization field name "headers" is used in two different message types, one for `cfcheckpt` (where it is serialized as an integer vector), and another time for `headers` (where it is serialized as a vector of `CBlockHeader`s). Parsing the latter fails as it is not an integer vector and thus triggers the assert. Fix this by adding the integer type check as additional condition to the `HASH_INT_VECTORS` check rather than asserting. Fixes #25954. ACKs for top commit: glozow: ACK 644772b Tree-SHA512: c98a107f6703c6c1a81771907c25bcc171c631b57fd605fbebaedd93d651e2ef02fb5601853a9bc7d659ab531c5f47770181173a36ea2b37f584aa7a37b66505
2 parents dd3ada6 + 644772b commit 3c5fb96

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

contrib/message-capture/message-capture-parser.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ def to_jsonable(obj: Any) -> Any:
7979
val = getattr(obj, slot, None)
8080
if slot in HASH_INTS and isinstance(val, int):
8181
ret[slot] = ser_uint256(val).hex()
82-
elif slot in HASH_INT_VECTORS:
83-
assert all(isinstance(a, int) for a in val)
82+
elif slot in HASH_INT_VECTORS and all(isinstance(a, int) for a in val):
8483
ret[slot] = [ser_uint256(a).hex() for a in val]
8584
else:
8685
ret[slot] = to_jsonable(val)

0 commit comments

Comments
 (0)