Skip to content

Commit

Permalink
feat: fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
jtguibas committed Aug 28, 2024
1 parent c6ad463 commit 7216d32
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
78 changes: 38 additions & 40 deletions crates/prover/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -997,13 +997,11 @@ impl<C: SP1ProverComponents> SP1Prover<C> {
#[cfg(any(test, feature = "export-tests"))]
pub mod tests {

use std::{
fs::File,
io::{Read, Write},
};
use std::{fs::File, io::Read, io::Write};

use super::*;

use crate::build::try_build_plonk_bn254_artifacts_dev;
use anyhow::Result;
use build::try_build_groth16_bn254_artifacts_dev;
use p3_field::PrimeField32;
Expand Down Expand Up @@ -1041,42 +1039,42 @@ pub mod tests {
let core_proof = prover.prove_core(&pk, &stdin, opts, context)?;
let public_values = core_proof.public_values.clone();

// tracing::info!("verify core");
// prover.verify(&core_proof.proof, &vk)?;
tracing::info!("verify core");
prover.verify(&core_proof.proof, &vk)?;

// if test_kind == Test::Core {
// return Ok(());
// }
if test_kind == Test::Core {
return Ok(());
}

// tracing::info!("compress");
// let compress_span = tracing::debug_span!("compress").entered();
// let compressed_proof = prover.compress(&vk, core_proof, vec![], opts)?;
// compress_span.exit();
tracing::info!("compress");
let compress_span = tracing::debug_span!("compress").entered();
let compressed_proof = prover.compress(&vk, core_proof, vec![], opts)?;
compress_span.exit();

// tracing::info!("verify compressed");
// prover.verify_compressed(&compressed_proof, &vk)?;
tracing::info!("verify compressed");
prover.verify_compressed(&compressed_proof, &vk)?;

// if test_kind == Test::Compress {
// return Ok(());
// }
if test_kind == Test::Compress {
return Ok(());
}

// tracing::info!("shrink");
// let shrink_proof = prover.shrink(compressed_proof, opts)?;
tracing::info!("shrink");
let shrink_proof = prover.shrink(compressed_proof, opts)?;

// tracing::info!("verify shrink");
// prover.verify_shrink(&shrink_proof, &vk)?;
tracing::info!("verify shrink");
prover.verify_shrink(&shrink_proof, &vk)?;

// if test_kind == Test::Shrink {
// return Ok(());
// }
if test_kind == Test::Shrink {
return Ok(());
}

// tracing::info!("wrap bn254");
// let wrapped_bn254_proof = prover.wrap_bn254(shrink_proof, opts)?;
// let bytes = bincode::serialize(&wrapped_bn254_proof).unwrap();
tracing::info!("wrap bn254");
let wrapped_bn254_proof = prover.wrap_bn254(shrink_proof, opts)?;
let bytes = bincode::serialize(&wrapped_bn254_proof).unwrap();

// // Save the proof.
// let mut file = File::create("proof-with-pis.bin").unwrap();
// file.write_all(bytes.as_slice()).unwrap();
// Save the proof.
let mut file = File::create("proof-with-pis.bin").unwrap();
file.write_all(bytes.as_slice()).unwrap();

// Load the proof.
let mut file = File::open("proof-with-pis.bin").unwrap();
Expand All @@ -1100,16 +1098,16 @@ pub mod tests {
let vk_digest_bn254 = wrapped_bn254_proof.sp1_vkey_digest_bn254();
assert_eq!(vk_digest_bn254, vk.hash_bn254());

// tracing::info!("generate plonk bn254 proof");
// let artifacts_dir = try_build_plonk_bn254_artifacts_dev(
// &wrapped_bn254_proof.vk,
// &wrapped_bn254_proof.proof,
// );
// let plonk_bn254_proof =
// prover.wrap_plonk_bn254(wrapped_bn254_proof.clone(), &artifacts_dir);
// println!("{:?}", plonk_bn254_proof);
tracing::info!("generate plonk bn254 proof");
let artifacts_dir = try_build_plonk_bn254_artifacts_dev(
&wrapped_bn254_proof.vk,
&wrapped_bn254_proof.proof,
);
let plonk_bn254_proof =
prover.wrap_plonk_bn254(wrapped_bn254_proof.clone(), &artifacts_dir);
println!("{:?}", plonk_bn254_proof);

// prover.verify_plonk_bn254(&plonk_bn254_proof, &vk, &public_values, &artifacts_dir)?;
prover.verify_plonk_bn254(&plonk_bn254_proof, &vk, &public_values, &artifacts_dir)?;

tracing::info!("generate groth16 bn254 proof");
let artifacts_dir = try_build_groth16_bn254_artifacts_dev(
Expand Down
2 changes: 2 additions & 0 deletions crates/recursion/circuit-v2/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ pub fn felts_to_bn254_var<C: Config>(
result
}

#[allow(dead_code)]
pub fn felt_bytes_to_bn254_var<C: Config>(
builder: &mut Builder<C>,
bytes: &[Felt<C::F>; 32],
Expand All @@ -91,6 +92,7 @@ pub fn felt_bytes_to_bn254_var<C: Config>(
result
}

#[allow(dead_code)]
pub fn words_to_bytes<T: Copy>(words: &[Word<T>]) -> Vec<T> {
words.iter().flat_map(|w| w.0).collect::<Vec<_>>()
}
Expand Down

0 comments on commit 7216d32

Please sign in to comment.