From badcb2c812b92d96925b7430effd1bee1a2c9438 Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Mon, 3 Feb 2025 13:24:30 +0200
Subject: feat(zkvms/risc0/wrapper_macro): Simplify public input committing

---
 zkvms/risc0/wrapper_macro/src/lib.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'zkvms/risc0/wrapper_macro')

diff --git a/zkvms/risc0/wrapper_macro/src/lib.rs b/zkvms/risc0/wrapper_macro/src/lib.rs
index d4ba858..5f924a8 100644
--- a/zkvms/risc0/wrapper_macro/src/lib.rs
+++ b/zkvms/risc0/wrapper_macro/src/lib.rs
@@ -18,15 +18,14 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
             include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml"))
         )
         .unwrap();
-    let public_patterns = args_divide_public(&args, &public_inputs.keys().collect())
-        .0
-        .iter()
-        .map(|x| x.to_string() + ".clone(), ")
-        .collect::<String>();
+    let public_patterns = args_divide_public(&args, &public_inputs.keys().collect()).0;
+    for pattern in public_patterns.iter() {
+        out.extend(format!("commit(&{});", pattern).parse::<TokenStream>());
+    }
 
     let (ts_patterns, _) = args_divide_grouped(&args);
 
-    out.extend(format!("commit(&({} zkp::{}{}));", public_patterns, name, ts_patterns).parse::<TokenStream>());
+    out.extend(format!("commit(&zkp::{}{});", name, ts_patterns).parse::<TokenStream>());
 
     let mut block = TokenStream::new();
     block.extend(format!("{{ {} }}", out).parse::<TokenStream>());
-- 
cgit v1.2.3