Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: print actual length in bytes in trimmed_hex #6919

Merged

Conversation

kcsongor
Copy link
Contributor

Motivation

The trimmed_hex function turns a slice of bytes into a hex string, trimming the output if the slice is longer than 32 bytes. If longer, an ellipsis is inserted in the middle, and the number of bytes is rendered into the output. Currently, this number actually corresponds to the length of the hex string, i.e. it's twice the number of bytes.

Solution

Render the length of the original slice instead of the hex string. I also slightly changed the code so only the visible parts of the slice are encoded as hex, which saves a bit of allocation.

Copy link
Member

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

defer to @DaniPopes here

Comment on lines +133 to +134
&hex::encode(&s[..n / 2]),
&hex::encode(&s[s.len() - n / 2..]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, not instantly obvious to me what the difference is

this now operates on the input and not the hex encoded input while also using 32 bytes instead of 64, but the slicing operations are the same?

so this is now only encodes the necessary slices? is that the change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the key change is that s.len() (the third argument of the format! invocation) now operates on the input slice, so it will print the correct length (where previously a shadowing binding for s was introduced so s.len() operated on the hex string, doubling the length).

the original bug is fixable with a smaller diff (just putting s.len() / 2 in the 3rd argument), I'm happy to do that instead if that's preferred

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so this is now only encodes the necessary slices? is that the change?

but yes, also only encodes the necessary slices -- technically that's an orthogonal change, but I thought the code looked a bit funny when all the operations were scaled back by 2

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was less calls to hex::encode, but it doesn't matter

Copy link
Member

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it now thanks @kcsongor

pending @DaniPopes

@DaniPopes DaniPopes merged commit 47e458b into foundry-rs:master Jan 27, 2024
19 checks passed
Jaxs88

This comment was marked as spam.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants