From 07aeb3a3abae3a842ce37d9ccc615154bf4b8911 Mon Sep 17 00:00:00 2001 From: pgherveou Date: Mon, 27 Mar 2023 16:37:33 +0200 Subject: [PATCH] PR comment --- frame/contracts/proc-macro/src/lib.rs | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/frame/contracts/proc-macro/src/lib.rs b/frame/contracts/proc-macro/src/lib.rs index 7612315710a05..5d6bb5fede470 100644 --- a/frame/contracts/proc-macro/src/lib.rs +++ b/frame/contracts/proc-macro/src/lib.rs @@ -610,7 +610,7 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2) // wrapped host function body call with host function traces // see https://github.com/paritytech/substrate/tree/master/frame/contracts#host-function-tracing let wrapped_body_with_trace = { - let params_fmt_str = params.clone().filter_map(|arg| match arg { + let trace_params = params.clone().filter_map(|arg| match arg { syn::FnArg::Receiver(_) => None, syn::FnArg::Typed(p) => { match *p.pat.clone() { @@ -618,24 +618,10 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2) _ => None, } }, - }) - .map(|s| format!("{s}: {{:?}}")) - .collect::>() - .join(", "); - - let trace_fmt_str = format!("{}::{}({}) = {{:?}}", module, name, params_fmt_str); - let trace_fmt_args = params.clone().filter_map(|arg| match arg { - syn::FnArg::Receiver(_) => None, - syn::FnArg::Typed(p) => { - match *p.pat.clone() { - syn::Pat::Ident(ref pat_ident) => Some(pat_ident.ident.clone()), - _ => None, - } - }, }); - let debug_buffer_fmt_str = format!("{}\n", trace_fmt_str); - let debug_buffer_fmt_args = trace_fmt_args.clone(); + let trace_fmt_str = trace_params.clone().map(|s| format!("{s}: {{:?}}")).collect::>().join(", "); + let trace_fmt_str = format!("{}::{}({}) = {{:?}}\n", module, name, trace_fmt_str); quote! { if ::log::log_enabled!(target: "runtime::contracts::strace", ::log::Level::Trace) { @@ -643,7 +629,7 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2) { use sp_std::fmt::Write; let mut w = sp_std::Writer::default(); - let _ = core::write!(&mut w, #debug_buffer_fmt_str, #( #debug_buffer_fmt_args, )* result); + let _ = core::write!(&mut w, #trace_fmt_str, #( #trace_params, )* result); let msg = core::str::from_utf8(&w.inner()).unwrap_or_default(); ctx.ext().append_debug_buffer(msg); }