From 79de586b1e61caabbc7ad1854d6dec41f56313d7 Mon Sep 17 00:00:00 2001
From: Srinath Setty <srinath@microsoft.com>
Date: Sat, 4 May 2024 11:17:25 -0700
Subject: [PATCH] avoid calls to pp.digest in prove methods (#320)

* avoid calls to pp.digest in prove methods

* remove unused

* address clippy
---
 src/gadgets/nonnative/mod.rs |  4 ----
 src/lib.rs                   |  9 +++++++--
 src/provider/hyperkzg.rs     |  6 ++++--
 src/r1cs/mod.rs              |  3 ++-
 src/spartan/direct.rs        |  2 +-
 src/spartan/math.rs          | 15 ---------------
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/gadgets/nonnative/mod.rs b/src/gadgets/nonnative/mod.rs
index 8167e5a7..4d611cbb 100644
--- a/src/gadgets/nonnative/mod.rs
+++ b/src/gadgets/nonnative/mod.rs
@@ -6,16 +6,12 @@ use ff::PrimeField;
 
 trait OptionExt<T> {
   fn grab(&self) -> Result<&T, SynthesisError>;
-  fn grab_mut(&mut self) -> Result<&mut T, SynthesisError>;
 }
 
 impl<T> OptionExt<T> for Option<T> {
   fn grab(&self) -> Result<&T, SynthesisError> {
     self.as_ref().ok_or(SynthesisError::AssignmentMissing)
   }
-  fn grab_mut(&mut self) -> Result<&mut T, SynthesisError> {
-    self.as_mut().ok_or(SynthesisError::AssignmentMissing)
-  }
 }
 
 trait BitAccess {
diff --git a/src/lib.rs b/src/lib.rs
index a999f127..0d6c3dc7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -185,7 +185,7 @@ where
       return Err(NovaError::InvalidStepCircuitIO);
     }
 
-    Ok(PublicParams {
+    let pp = PublicParams {
       F_arity_primary,
       F_arity_secondary,
       ro_consts_primary,
@@ -200,7 +200,12 @@ where
       augmented_circuit_params_secondary,
       digest: OnceCell::new(),
       _p: Default::default(),
-    })
+    };
+
+    // call pp.digest() so the digest is computed here rather than in RecursiveSNARK methods
+    let _ = pp.digest();
+
+    Ok(pp)
   }
 
   /// Retrieve the digest of the public parameters.
diff --git a/src/provider/hyperkzg.rs b/src/provider/hyperkzg.rs
index 6afc9a53..30d9d395 100644
--- a/src/provider/hyperkzg.rs
+++ b/src/provider/hyperkzg.rs
@@ -765,7 +765,8 @@ mod tests {
 
     // Change the proof and expect verification to fail
     let mut bad_proof = proof.clone();
-    bad_proof.v[0] = bad_proof.v[1].clone();
+    let v1 = bad_proof.v[1].clone();
+    bad_proof.v[0].clone_from(&v1);
     let mut verifier_transcript2 = Keccak256Transcript::new(b"TestEval");
     assert!(EvaluationEngine::verify(
       &vk,
@@ -808,7 +809,8 @@ mod tests {
 
       // Change the proof and expect verification to fail
       let mut bad_proof = proof.clone();
-      bad_proof.v[0] = bad_proof.v[1].clone();
+      let v1 = bad_proof.v[1].clone();
+      bad_proof.v[0].clone_from(&v1);
       let mut verifier_tr2 = Keccak256Transcript::new(b"TestEval");
       assert!(
         EvaluationEngine::verify(&vk, &mut verifier_tr2, &C, &point, &eval, &bad_proof).is_err()
diff --git a/src/r1cs/mod.rs b/src/r1cs/mod.rs
index 56ef1394..b70b1876 100644
--- a/src/r1cs/mod.rs
+++ b/src/r1cs/mod.rs
@@ -480,7 +480,8 @@ impl<E: Engine> RelaxedR1CSInstance<E> {
     let mut r_instance = RelaxedR1CSInstance::default(ck, S);
     r_instance.comm_W = instance.comm_W;
     r_instance.u = E::Scalar::ONE;
-    r_instance.X = instance.X.clone();
+    r_instance.X.clone_from(&instance.X);
+
     r_instance
   }
 
diff --git a/src/spartan/direct.rs b/src/spartan/direct.rs
index 80986a2a..83cad2c3 100644
--- a/src/spartan/direct.rs
+++ b/src/spartan/direct.rs
@@ -277,7 +277,7 @@ mod tests {
       assert!(res.is_ok());
 
       // set input to the next step
-      z_i = z_i_plus_one.clone();
+      z_i.clone_from(&z_i_plus_one);
     }
 
     // sanity: check the claimed output with a direct computation of the same
diff --git a/src/spartan/math.rs b/src/spartan/math.rs
index 691fec5d..22dbce17 100644
--- a/src/spartan/math.rs
+++ b/src/spartan/math.rs
@@ -1,23 +1,8 @@
 pub trait Math {
-  fn pow2(self) -> usize;
-  fn get_bits(self, num_bits: usize) -> Vec<bool>;
   fn log_2(self) -> usize;
 }
 
 impl Math for usize {
-  #[inline]
-  fn pow2(self) -> usize {
-    let base: usize = 2;
-    base.pow(self as u32)
-  }
-
-  /// Returns the `num_bits` from n in a canonical order
-  fn get_bits(self, num_bits: usize) -> Vec<bool> {
-    (0..num_bits)
-      .map(|shift_amount| ((self & (1 << (num_bits - shift_amount - 1))) > 0))
-      .collect::<Vec<bool>>()
-  }
-
   fn log_2(self) -> usize {
     assert_ne!(self, 0);