Skip to content

Remove redundant allocation when resolving script ABI functions #12421

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

Closed
wants to merge 1 commit into from
Closed

Remove redundant allocation when resolving script ABI functions #12421

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
15 changes: 8 additions & 7 deletions crates/script/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,16 +377,17 @@ impl ScriptArgs {
.find(|&abi_func| abi_func.selector() == func.selector())
.wrap_err(format!("Function `{}` is not implemented in your script.", self.sig))?
} else {
let matching_functions =
abi.functions().filter(|func| func.name == self.sig).collect::<Vec<_>>();
match matching_functions.len() {
0 => eyre::bail!("Function `{}` not found in the ABI", self.sig),
1 => matching_functions[0],
2.. => eyre::bail!(
let mut matching_functions = abi.functions().filter(|func| func.name == self.sig);
let Some(func) = matching_functions.next() else {
eyre::bail!("Function `{}` not found in the ABI", self.sig);
};
if matching_functions.next().is_some() {
eyre::bail!(
"Multiple functions with the same name `{}` found in the ABI",
self.sig
),
);
}
func
};
let data = encode_function_args(func, &self.args)?;

Expand Down