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.

Sign up for GitHub

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
merged 1 commit into from
Jan 27, 2024
Merged

fix: print actual length in bytes in trimmed_hex #6919

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions crates/evm/core/src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,28 @@ pub fn maybe_decode_revert(
}

fn trimmed_hex(s: &[u8]) -> String {
let s = hex::encode(s);
let n = 32 * 2;
let n = 32;
if s.len() <= n {
s
hex::encode(s)
} else {
format!("{}…{} ({} bytes)", &s[..n / 2], &s[s.len() - n / 2..], s.len())
format!(
"{}…{} ({} bytes)",
&hex::encode(&s[..n / 2]),
&hex::encode(&s[s.len() - n / 2..]),
Comment on lines +133 to +134
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

s.len()
)
}
}

#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_trimmed_hex() {
assert_eq!(trimmed_hex(&hex::decode("1234567890").unwrap()), "1234567890");
assert_eq!(
trimmed_hex(&hex::decode("492077697368207275737420737570706F72746564206869676865722D6B696E646564207479706573").unwrap()),
"49207769736820727573742073757070…6865722d6b696e646564207479706573 (41 bytes)"
);
}
}
Loading