solve conflicts (#521)

Cargo.toml

@@ -20,6 +20,7 @@ bellperson = { workspace = true }
 bincode = { workspace = true }
 blstrs = { workspace = true }
 clap = { version = "4.3.10", features = ["derive"] }
+config = "0.13.3"
 dashmap = "5.4.0"
 ff = { workspace = true }
 generic-array = "0.14.6"

benches/end2end.rs

@@ -272,7 +272,7 @@ fn prove_benchmark(c: &mut Criterion) {
 
         b.iter(|| {
             let result = prover
-                .prove(&pp, frames.clone(), &mut store, lang_pallas_rc.clone())
+                .prove(&pp, &frames, &mut store, lang_pallas_rc.clone())
                 .unwrap();
             black_box(result);
         })
@@ -307,13 +307,13 @@ fn verify_benchmark(c: &mut Criterion) {
                 .get_evaluation_frames(ptr, empty_sym_env(&store), &mut store, limit, &lang_pallas)
                 .unwrap();
             let (proof, z0, zi, num_steps) = prover
-                .prove(&pp, frames, &mut store, lang_pallas_rc.clone())
+                .prove(&pp, &frames, &mut store, lang_pallas_rc.clone())
                 .unwrap();
 
             b.iter_batched(
                 || z0.clone(),
                 |z0| {
-                    let result = proof.verify(&pp, num_steps, z0, &zi[..]).unwrap();
+                    let result = proof.verify(&pp, num_steps, &z0, &zi[..]).unwrap();
                     black_box(result);
                 },
                 BatchSize::LargeInput,
@@ -352,7 +352,7 @@ fn verify_compressed_benchmark(c: &mut Criterion) {
                 .get_evaluation_frames(ptr, empty_sym_env(&store), &mut store, limit, &lang_pallas)
                 .unwrap();
             let (proof, z0, zi, num_steps) = prover
-                .prove(&pp, frames, &mut store, lang_pallas_rc.clone())
+                .prove(&pp, &frames, &mut store, lang_pallas_rc.clone())
                 .unwrap();
 
             let compressed_proof = proof.compress(&pp).unwrap();
@@ -361,7 +361,7 @@ fn verify_compressed_benchmark(c: &mut Criterion) {
                 || z0.clone(),
                 |z0| {
                     let result = compressed_proof
-                        .verify(&pp, num_steps, z0, &zi[..])
+                        .verify(&pp, num_steps, &z0, &zi[..])
                         .unwrap();
                     black_box(result);
                 },

benches/fibonacci.rs

@@ -117,7 +117,7 @@ fn fibo_prove<M: measurement::Measurement>(name: &str, iterations: u64, c: &mut
             b.iter_batched(
                 || (frames.clone(), lang_rc.clone()), // avoid cloning the frames in the benchmark
                 |(frames, lang_rc)| {
-                    let result = prover.prove(&pp, frames, &mut store, lang_rc).unwrap();
+                    let result = prover.prove(&pp, &frames, &mut store, lang_rc).unwrap();
                     black_box(result);
                 },
                 BatchSize::LargeInput,

deny.toml

@@ -109,6 +109,7 @@ allow = [
     "CC0-1.0",
     "Apache-2.0",
     "Unicode-DFS-2016",
+    "ISC",
 ]
 # List of explicitly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses

examples/sha256.rs

@@ -190,7 +190,7 @@ fn main() {
     println!("Verifying proof...");
 
     let verify_start = Instant::now();
-    let res = proof.verify(&pp, num_steps, z0, &zi).unwrap();
+    let res = proof.verify(&pp, num_steps, &z0, &zi).unwrap();
     let verify_end = verify_start.elapsed();
 
     println!("Verify took {:?}", verify_end);

fcomm/src/lib.rs

@@ -931,7 +931,7 @@ impl<'a> Proof<'a, S1> {
         let verified = claim_iterations_and_num_steps_are_consistent
             && self
                 .proof
-                .verify(pp, self.num_steps, public_inputs, &public_outputs)
+                .verify(pp, self.num_steps, &public_inputs, &public_outputs)
                 .expect("error verifying");
 
         let result = VerificationResult::new(verified);