Remove dupplicates definitions of read_witnesses

Author: sebastiencs

ledger/src/proofs/block.rs

@@ -1,4 +1,4 @@
-use std::{path::Path, rc::Rc, str::FromStr, sync::Arc};
+use std::{rc::Rc, sync::Arc};
 
 use mina_curves::pasta::Fq;
 use mina_hasher::Fp;
@@ -53,23 +53,6 @@ use super::{
     wrap::WrapProof,
 };
 
-fn read_witnesses() -> Vec<Fp> {
-    let f = std::fs::read_to_string(
-        Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("rampup4")
-            .join("block_fps.txt"),
-    )
-    .unwrap();
-
-    let fps = f
-        .lines()
-        .filter(|s| !s.is_empty())
-        .map(|s| Fp::from_str(s).unwrap())
-        .collect::<Vec<_>>();
-
-    fps
-}
-
 impl ToFieldElements<Fp> for v2::MinaStateSnarkTransitionValueStableV2 {
     fn to_field_elements(&self, fields: &mut Vec<Fp>) {
         let Self {
@@ -1744,8 +1727,6 @@ pub struct BlockParams<'a> {
 const BLOCK_N_PREVIOUS_PROOFS: usize = 2;
 
 pub(super) fn generate_block_proof(params: BlockParams, w: &mut Witness<Fp>) -> WrapProof {
-    w.ocaml_aux = read_witnesses();
-
     let BlockParams {
         input:
             v2::ProverExtendBlockchainInputStableV2 {

ledger/src/proofs/merge.rs

@@ -1,4 +1,4 @@
-use std::{path::Path, rc::Rc, str::FromStr};
+use std::rc::Rc;
 
 use crate::proofs::{
     constants::{make_step_transaction_data, StepMergeProof},
@@ -33,25 +33,6 @@ use super::{
     wrap::WrapProof,
 };
 
-pub fn read_witnesses() -> std::io::Result<Vec<Fp>> {
-    let f = std::fs::read_to_string(
-        Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("rampup4")
-            .join("fps_merge.txt"),
-    )?;
-    // let f = std::fs::read_to_string(Path::new(env!("CARGO_MANIFEST_DIR")).join("fps.txt"))?;
-
-    let fps = f
-        .lines()
-        .filter(|s| !s.is_empty())
-        .map(|s| Fp::from_str(s).unwrap())
-        .collect::<Vec<_>>();
-
-    // TODO: Implement [0..652]
-    // Ok(fps.split_off(652))
-    Ok(fps)
-}
-
 fn merge_main(
     statement: &Statement<SokDigest>,
     proofs: &[v2::LedgerProofProdStableV2; 2],

ledger/src/proofs/transaction.rs

@@ -4609,7 +4609,7 @@ mod tests {
         } = get_provers();
 
         let mut witnesses: Witness<Fp> = Witness::new::<StepMergeProof>();
-        witnesses.ocaml_aux = crate::proofs::merge::read_witnesses().unwrap();
+        witnesses.ocaml_aux = read_witnesses("fps_merge.txt").unwrap();
 
         let WrapProof { proof, .. } = generate_merge_proof(
             MergeParams {
@@ -4752,6 +4752,7 @@ mod tests {
             zkapp_step_proof_prover: _,
         } = get_provers();
         let mut witnesses: Witness<Fp> = Witness::new::<StepBlockProof>();
+        witnesses.ocaml_aux = read_witnesses("block_fps.txt").unwrap();
 
         let WrapProof { proof, .. } = generate_block_proof(
             BlockParams {
@@ -4837,6 +4838,7 @@ mod tests {
                 read_binprot(&mut data.as_slice());
 
             let mut witnesses: Witness<Fp> = Witness::new::<StepBlockProof>();
+            witnesses.ocaml_aux = read_witnesses("block_fps.txt").unwrap();
 
             let WrapProof { proof, .. } = generate_block_proof(
                 BlockParams {
@@ -4867,7 +4869,7 @@ mod tests {
             let (statement, proofs, message) = extract_merge(&data);
 
             let mut witnesses: Witness<Fp> = Witness::new::<StepMergeProof>();
-            witnesses.ocaml_aux = crate::proofs::merge::read_witnesses().unwrap();
+            witnesses.ocaml_aux = read_witnesses("fps_merge.txt").unwrap();
 
             let WrapProof { proof, .. } = generate_merge_proof(
                 MergeParams {