diff options
Diffstat (limited to 'zkvms/zkm/wrapper_macro/src/lib.rs')
| -rw-r--r-- | zkvms/zkm/wrapper_macro/src/lib.rs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/zkvms/zkm/wrapper_macro/src/lib.rs b/zkvms/zkm/wrapper_macro/src/lib.rs index 216d3d8..cb8060a 100644 --- a/zkvms/zkm/wrapper_macro/src/lib.rs +++ b/zkvms/zkm/wrapper_macro/src/lib.rs @@ -2,7 +2,9 @@ use proc_macro::TokenStream; #[path = "../../../../guests_macro/src/parse_fn.rs"] mod parse_fn; -use crate::parse_fn::{ split_fn, args_split, args_divide_public, args_divide_grouped, group_streams }; +use crate::parse_fn::{ + args_divide_grouped, args_divide_public, args_split, group_streams, split_fn, +}; /// Create a body, which reads all public and private inputs, stores them in /// variables, then executes the guest entrypoint function with those arguments @@ -33,14 +35,17 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream { let (ts_patterns, _) = args_divide_grouped(&args); - let public_inputs = toml::from_str::<toml::Table>( - include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml")) - ) - .unwrap(); - let ((pub_pat, pub_typ), (prv_pat, prv_typ)) = args_divide_public(&args, &public_inputs.keys().collect()); + let public_inputs = toml::from_str::<toml::Table>(include_str!(concat!( + env!("INPUTS_DIR"), + "/default_public_input.toml" + ))) + .unwrap(); + let ((pub_pat, pub_typ), (prv_pat, prv_typ)) = + args_divide_public(&args, &public_inputs.keys().collect()); let ((pub_pat, pub_typ), (prv_pat, prv_typ)) = ( (group_streams(&pub_pat), group_streams(&pub_typ)), - (group_streams(&prv_pat), group_streams(&prv_typ))); + (group_streams(&prv_pat), group_streams(&prv_typ)), + ); let mut out = TokenStream::new(); // NOTE: The first read returns public data, the second returns private |