Make tx size calculation consistent #3937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marta-lokhova
force-pushed
the
tx_size_fix
branch
from
aa4dd87
to
dae8b2e
Compare
|
Thanks for the fix, please update the test. |
dmkozh
reviewed
Sep 14, 2023
src/overlay/FlowControlCapacity.cpp
Outdated
| @@ -75,8 +75,55 @@ FlowControlByteCapacity::getCapacityLimits() const | |||
| uint64_t | |||
| FlowControlByteCapacity::getMsgResourceCount(StellarMessage const& msg) const | |||
| { | |||
|
|
|||
| return static_cast<uint64_t>(xdr::xdr_argpack_size(msg)); | |||
| switch (msg.type()) | |||
There was a problem hiding this comment.
How is this different from the generated implementation?
There was a problem hiding this comment.
we need to exclude size of type (additional 4 bytes) for the calculation to be consistent with the rest of the codebase. I updated this function to be less verbose though.
There was a problem hiding this comment.
Thanks, it's much more clear now.
marta-lokhova
force-pushed
the
tx_size_fix
branch
2 times, most recently
from
a15c415
to
006b6af
Compare
marta-lokhova
force-pushed
the
tx_size_fix
branch
from
006b6af
to
0843e92
Compare
|
r+ 0843e92 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #3786 to resolve #3765. Also, I updated the calculation on the overlay side to not include XDR type overhead (4 bytes).