Skip to content

fix: issues 4 and 6 #7

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

Open
frolvanya wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −31
Open

fix: issues 4 and 6 #7

Show file tree
Hide file tree
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
38 changes: 9 additions & 29 deletions omni-utils-derive/src/trusted_relayer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use syn::parse::{Parse, ParseStream};
use syn::punctuated::Punctuated;
use syn::{Expr, ImplItem, ItemFn, ItemImpl, Token, parenthesized, parse_macro_input};
use syn::{Expr, ImplItem, ItemImpl, Token, parenthesized, parse_macro_input};

struct RoleExpr {
expr: Expr,
Expand Down Expand Up @@ -433,25 +433,6 @@ fn process_impl_block(args: TokenStream, input: TokenStream) -> TokenStream {
output.into()
}

fn process_fn(input: TokenStream) -> TokenStream {
let mut item_fn = parse_macro_input!(input as ItemFn);

let guard = syn::parse2::<syn::Stmt>(quote! {
::near_sdk::require!(
<Self as ::omni_utils::trusted_relayer::TrustedRelayer>::is_trusted_relayer(
self,
&::near_sdk::env::predecessor_account_id(),
),
"Relayer is not active"
);
})
.expect("failed to parse trusted_relayer guard statement");

item_fn.block.stmts.insert(0, guard);

quote! { #item_fn }.into()
}

pub fn trusted_relayer(args: TokenStream, input: TokenStream) -> TokenStream {
let input_clone: proc_macro2::TokenStream = input.clone().into();

Expand All @@ -465,15 +446,14 @@ pub fn trusted_relayer(args: TokenStream, input: TokenStream) -> TokenStream {
process_impl_block(args, input)
}
} else {
if !args.is_empty() {
return syn::Error::new(
proc_macro2::Span::call_site(),
"`#[trusted_relayer]` on methods does not accept arguments",
)
.to_compile_error()
.into();
}
process_fn(input)
syn::Error::new(
proc_macro2::Span::call_site(),
"`#[trusted_relayer]` can only be applied to impl blocks, \
not standalone functions. Use it on methods inside an impl block \
annotated with `#[trusted_relayer]`.",
)
.to_compile_error()
.into()
}
}

Expand Down
4 changes: 2 additions & 2 deletions omni-utils/src/near_expect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ impl<T> NearExpect<T> for Option<T> {
}
}

impl<T, E> NearExpect<T> for Result<T, E> {
impl<T, E: core::fmt::Debug> NearExpect<T> for Result<T, E> {
fn near_expect(self, msg: impl AsRef<str>) -> T {
self.unwrap_or_else(|_| near_sdk::env::panic_str(msg.as_ref()))
self.unwrap_or_else(|err| near_sdk::env::panic_str(&format!("{}: {:?}", msg.as_ref(), err)))
Copy link
Copy Markdown
Contributor Author

@frolvanya frolvanya Mar 31, 2026

Choose a reason for hiding this comment

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

@olga24912 I'm still not sure about this, we have a lot of places like result.near_expect("ERR_XYZ") and later we check if err == ERR_XYZ. I'm not sure that adding extra context is good

}
}
Loading