remove _prove functions

Author: ed255

src/backends/plonky2/emptypod.rs

@@ -106,7 +106,7 @@ static EMPTY_POD_CACHE: LazyLock<Mutex<HashMap<Hash, EmptyPod>>> =
     LazyLock::new(|| Mutex::new(HashMap::new()));
 
 impl EmptyPod {
-    pub fn _prove(params: &Params, vd_set: VDSet) -> Result<EmptyPod> {
+    pub fn new(params: &Params, vd_set: VDSet) -> Result<EmptyPod> {
         let (empty_pod_verify_target, data) = &*STANDARD_EMPTY_POD_DATA;
 
         let mut pw = PartialWitness::<F>::new();
@@ -129,7 +129,7 @@ impl EmptyPod {
             .lock()
             .unwrap()
             .entry(vd_set.root())
-            .or_insert_with(|| Self::_prove(params, vd_set).expect("prove EmptyPod"))
+            .or_insert_with(|| Self::new(params, vd_set).expect("prove EmptyPod"))
             .clone();
         Box::new(empty_pod)
     }

src/backends/plonky2/mainpod/mod.rs

@@ -431,8 +431,13 @@ pub(crate) fn process_public_statements_operations(
 
 pub struct Prover {}
 
-impl Prover {
-    fn _prove(&self, params: &Params, vd_set: &VDSet, inputs: MainPodInputs) -> Result<MainPod> {
+impl PodProver for Prover {
+    fn prove(
+        &self,
+        params: &Params,
+        vd_set: &VDSet,
+        inputs: MainPodInputs,
+    ) -> Result<Box<dyn RecursivePod>> {
         let rec_circuit_data = &*STANDARD_REC_MAIN_POD_CIRCUIT_DATA;
         let (main_pod_target, circuit_data) =
             RecursiveCircuit::<MainPodVerifyTarget>::target_and_circuit_data_padded(
@@ -542,24 +547,13 @@ impl Prover {
         };
         let proof_with_pis = main_pod.prove(&input, proofs, verifier_datas)?;
 
-        Ok(MainPod {
+        Ok(Box::new(MainPod {
             params: params.clone(),
             id,
             vd_set: inputs.vds_set,
             public_statements,
             proof: proof_with_pis.proof,
-        })
-    }
-}
-
-impl PodProver for Prover {
-    fn prove(
-        &self,
-        params: &Params,
-        vd_set: &VDSet,
-        inputs: MainPodInputs,
-    ) -> Result<Box<dyn RecursivePod>> {
-        Ok(self._prove(params, vd_set, inputs).map(Box::new)?)
+        }))
     }
 }
 

src/backends/plonky2/mock/signedpod.rs

@@ -186,7 +186,7 @@ pub mod tests {
             .downcast::<MockSignedPod>()
             .unwrap();
 
-        pod._verify()?;
+        pod.verify()?;
         println!("id: {}", pod.id());
         println!("kvs: {:?}", pod.kvs());
 

src/backends/plonky2/signedpod.rs

@@ -225,7 +225,7 @@ pub mod tests {
         let pod = pod.sign(&mut signer).unwrap();
         let pod = (pod.pod as Box<dyn Any>).downcast::<SignedPod>().unwrap();
 
-        pod._verify()?;
+        pod.verify()?;
         println!("id: {}", pod.id());
         println!("kvs: {:?}", pod.kvs());