unsigned int -> size_t in merkleblock-related code
ClosedPublic
Actions

Authored by markblundeberg on Jun 23 2019, 20:50.

Details

Reviewers

deadalnix
jasonbcox
Fabien
nakihito

Group Reviewers

Restricted Project

Commits

rSTAGING37da7fbc098c: unsigned int -> size_t in merkleblock-related code
rABC37da7fbc098c: unsigned int -> size_t in merkleblock-related code

Summary

A lot of code was using unsigned int for the type used in list
iterators, indices, etc..
This switches to size_t. Note that there is one exception, nTransactions,
which has been explicitly switched to a 32-bit integer as that is what the
serialization protocol demands. If transactions with 4 billion transactions
ever happen, a bit more work will be needed. ;-) (In reality, this part of
the code will need to be rewritten and optimized quite a bit for that
eventuality, if not discarded altogether.)

Also, introduces braces in multiple places (code style).

Test Plan

make check

Diff Detail

Repository

rABC Bitcoin ABC

Branch

bip37_ints

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 6455
Build 10957: Bitcoin ABC Buildbot (legacy)
Build 10956: arc lint + arc unit

Event Timeline

markblundeberg created this revision.Jun 23 2019, 20:50

Herald added a reviewer: Restricted Project. · View Herald TranscriptJun 23 2019, 20:50

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

markblundeberg edited the summary of this revision. (Show Details)Jun 23 2019, 20:52

markblundeberg added inline comments.

src/test/bloom_tests.cpp
233	another catch here ... this really should have been uint32_t all along

Harbormaster completed remote builds in B6455: Diff 9602.Jun 23 2019, 20:58

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

markblundeberg added a child revision: D3371: fix BIP37 processing for non-topologically ordered blocks.Jun 23 2019, 21:22

deadalnix accepted this revision.Jun 24 2019, 15:33

This revision is now accepted and ready to land.Jun 24 2019, 15:33

markblundeberg added inline comments.Jun 24 2019, 15:56

src/test/bloom_tests.cpp
236	Note: it would seem on first glance that this should break on big-endian machines, but this only manually tests an outpoint with n=0, and 0x00000000 is a palindrome. So, this code block will only fail on weird architectures where `sizeof(uint32_t) != 4`, however that is already being tested for / assumed in `serialize_tests.cpp`.