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: parse selector hashes in sol macro #730

Merged
merged 7 commits into from
Sep 6, 2024
Merged

fix: parse selector hashes in sol macro #730

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6a1982
fix: parse selectors in sol macro
cre-mer Sep 6, 2024
b5dc4e9
run fmt
cre-mer Sep 6, 2024
f8e47b4
add clippy lint suggestoins
cre-mer Sep 6, 2024
e8cd54b
code formatting
cre-mer Sep 6, 2024
79bfc34
more formatting
cre-mer Sep 6, 2024
097f7a6
feat: include namespaces, add tests
DaniPopes Sep 6, 2024
5581f45
chore: use [u8; 4]
DaniPopes Sep 6, 2024
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
Prev Previous commit
Next Next commit
code formatting
  • Loading branch information
@cre-mer
cre-mer committed Sep 6, 2024
commit e8cd54b728ccffc3e3066b70e947e041659a34f7
6 changes: 3 additions & 3 deletions crates/sol-macro-expander/src/expand/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,11 @@ impl<'ast> ExpCtxt<'ast> {
}
Item::Error(err) => {
let err_selector = self.selector_hash(&self.error_selector(err));
if err_selector.eq("00000000") || err_selector.eq("ffffffff") {
if err_selector.eq("0x00000000") || err_selector.eq("0xffffffff") {
failed = true;
emit_error!(
err.span(),
"illegal usage of reserved error signature hash `0x{}`",
"illegal usage of reserved error signature hash `{}`",
err_selector
);
}
Expand Down Expand Up @@ -562,7 +562,7 @@ impl<'ast> ExpCtxt<'ast> {
}

fn selector_hash(&self, item: &ExprArray<u8>) -> String {
item.array.iter().fold(String::new(), |mut output, b| {
item.array.iter().fold(String::from("0x"), |mut output, b| {
let _ = write!(output, "{b:02X}");
output
})
Expand Down