diff options
author | Andrew Chow <github@achow101.com> | 2023-06-13 10:23:51 -0400 |
---|---|---|
committer | Andrew Chow <github@achow101.com> | 2023-06-13 10:37:25 -0400 |
commit | 58b36fc303df604bbfb9a752a58262b51c26bab9 (patch) | |
tree | ba573d05d609d0a8a557fa761927c1c15415ab46 /test/functional | |
parent | 8de9bb7a5ab04669369e2bb59ea92a5c1a91a8d2 (diff) | |
parent | 3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f (diff) | |
download | bitcoin-58b36fc303df604bbfb9a752a58262b51c26bab9.tar.xz |
Merge bitcoin/bitcoin#23962: Use `int32_t` type for most transaction size/weight values
3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f Remove txmempool implicit-integer-sign-change sanitizer suppressions (Hennadii Stepanov)
d2f6d2a95a9f6c1632c1ed3b5b5b67a49eb71d6b Use `int32_t` type for most transaction size/weight values (Hennadii Stepanov)
Pull request description:
From bitcoin/bitcoin#23957 which has been incorporated into this PR:
> A file-wide suppression is problematic because it will wave through future violations, potentially bugs.
>
> Fix that by using per-statement casts.
>
> This refactor doesn't change behavior because the now explicit casts were previously done implicitly.
>
> Similar to commit 8b5a4de904b414fb3a818732cd0a2c90b91bc275
ACKs for top commit:
achow101:
ACK 3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f
0xB10C:
ACK 3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f. I've focused my testing and code review on the tracepoint related changes. The docs, the test, and the mempool_monitor.py demo script are updated. I ran the `interface_usdt_mempool.py` test and the `mempool_monitor.py` script. The `mempool_monitor.py` output looks correct.
Xekyo:
codereview ACK 3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f
ryanofsky:
Code review ACK 3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f. Since last review, just rebased with more type changes in test and tracing code
Tree-SHA512: 397407f72165b6fb85ff1794eb1447836c4f903efed1a05d7a9704c88aa9b86f330063964370bbd59f6b5e322e04e7ea8e467805d58dce381e68f7596433330f
Diffstat (limited to 'test/functional')
-rwxr-xr-x | test/functional/interface_usdt_mempool.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/interface_usdt_mempool.py b/test/functional/interface_usdt_mempool.py index 542849d558..7f088a3ca8 100755 --- a/test/functional/interface_usdt_mempool.py +++ b/test/functional/interface_usdt_mempool.py @@ -35,7 +35,7 @@ MEMPOOL_TRACEPOINTS_PROGRAM = """ struct added_event { u8 hash[HASH_LENGTH]; - u64 vsize; + s32 vsize; s64 fee; }; @@ -43,7 +43,7 @@ struct removed_event { u8 hash[HASH_LENGTH]; char reason[MAX_REMOVAL_REASON_LENGTH]; - u64 vsize; + s32 vsize; s64 fee; u64 entry_time; }; @@ -57,11 +57,11 @@ struct rejected_event struct replaced_event { u8 replaced_hash[HASH_LENGTH]; - u64 replaced_vsize; + s32 replaced_vsize; s64 replaced_fee; u64 replaced_entry_time; u8 replacement_hash[HASH_LENGTH]; - u64 replacement_vsize; + s32 replacement_vsize; s64 replacement_fee; }; |