Browse Source

Make the dump feature flag work again

Ian Goldberg 4 months ago
parent
commit
edc6d2b636
2 changed files with 36 additions and 33 deletions
  1. 20 18
      sigma_compiler_core/src/codegen.rs
  2. 16 15
      sigma_compiler_core/src/sigma/codegen.rs

+ 20 - 18
sigma_compiler_core/src/codegen.rs

@@ -314,15 +314,6 @@ impl CodeGen {
 
         // Generate the prove function
         let prove_func = if emit_prover {
-            let dumper = if cfg!(feature = "dump") {
-                quote! {
-                    println!("prover params = {{");
-                    params.dump();
-                    println!("}}");
-                }
-            } else {
-                quote! {}
-            };
             let params_ids = pub_params_fields.field_list();
             let witness_ids = witness_fields.field_list();
             let sigma_rs_params_ids = sigma_rs_params_fields.field_list();
@@ -352,6 +343,16 @@ impl CodeGen {
                 quote! { #(#chunks)* }
             };
 
+            let dumper = if cfg!(feature = "dump") {
+                quote! {
+                    println!("prover params = {{");
+                    #params_var.dump();
+                    println!("}}");
+                }
+            } else {
+                quote! {}
+            };
+
             quote! {
                 pub fn prove(
                     #params_var: &Params,
@@ -388,15 +389,6 @@ impl CodeGen {
 
         // Generate the verify function
         let verify_func = if emit_verifier {
-            let dumper = if cfg!(feature = "dump") {
-                quote! {
-                    println!("verifier params = {{");
-                    params.dump();
-                    println!("}}");
-                }
-            } else {
-                quote! {}
-            };
             let params_ids = pub_params_fields.field_list();
             let sigma_rs_params_ids = sigma_rs_params_fields.field_list();
             let verify_pre_params_code = &self.verify_pre_params_code;
@@ -442,6 +434,16 @@ impl CodeGen {
                 }
             };
 
+            let dumper = if cfg!(feature = "dump") {
+                quote! {
+                    println!("verifier params = {{");
+                    #params_var.dump();
+                    println!("}}");
+                }
+            } else {
+                quote! {}
+            };
+
             quote! {
                 pub fn verify(
                     #params_var: &Params,

+ 16 - 15
sigma_compiler_core/src/sigma/codegen.rs

@@ -631,22 +631,23 @@ impl<'a> CodeGen<'a> {
 
         // Generate the prove function
         let prove_func = if emit_prover {
+            let params_var = format_ident!("{}params", self.unique_prefix);
+            let witness_var = format_ident!("{}witness", self.unique_prefix);
+            let session_id_var = format_ident!("{}session_id", self.unique_prefix);
+            let rng_var = format_ident!("{}rng", self.unique_prefix);
+            let proto_var = format_ident!("{}proto", self.unique_prefix);
+            let proto_witness_var = format_ident!("{}proto_witness", self.unique_prefix);
+            let nizk_var = format_ident!("{}nizk", self.unique_prefix);
+
             let dumper = if cfg!(feature = "dump") {
                 quote! {
                     println!("prover params = {{");
-                    params.dump();
+                    #params_var.dump();
                     println!("}}");
                 }
             } else {
                 quote! {}
             };
-            let params_var = format_ident!("{}params", self.unique_prefix);
-            let witness_var = format_ident!("{}witness", self.unique_prefix);
-            let session_id_var = format_ident!("{}session_id", self.unique_prefix);
-            let rng_var = format_ident!("{}rng", self.unique_prefix);
-            let proto_var = format_ident!("{}proto", self.unique_prefix);
-            let proto_witness_var = format_ident!("{}proto_witness", self.unique_prefix);
-            let nizk_var = format_ident!("{}nizk", self.unique_prefix);
 
             quote! {
                 pub fn prove(
@@ -673,22 +674,22 @@ impl<'a> CodeGen<'a> {
 
         // Generate the verify function
         let verify_func = if emit_verifier {
+            let params_var = format_ident!("{}params", self.unique_prefix);
+            let proof_var = format_ident!("{}proof", self.unique_prefix);
+            let session_id_var = format_ident!("{}session_id", self.unique_prefix);
+            let proto_var = format_ident!("{}proto", self.unique_prefix);
+            let nizk_var = format_ident!("{}nizk", self.unique_prefix);
+
             let dumper = if cfg!(feature = "dump") {
                 quote! {
                     println!("verifier params = {{");
-                    params.dump();
+                    #params_var.dump();
                     println!("}}");
                 }
             } else {
                 quote! {}
             };
 
-            let params_var = format_ident!("{}params", self.unique_prefix);
-            let proof_var = format_ident!("{}proof", self.unique_prefix);
-            let session_id_var = format_ident!("{}session_id", self.unique_prefix);
-            let proto_var = format_ident!("{}proto", self.unique_prefix);
-            let nizk_var = format_ident!("{}nizk", self.unique_prefix);
-
             quote! {
                 pub fn verify(
                     #params_var: &Params,