From 494048c13030178b74aa19e3063f6e4c7d00eef7 Mon Sep 17 00:00:00 2001 From: Ray Gao Date: Thu, 19 Sep 2024 14:23:55 -0400 Subject: [PATCH] Organize compression unit tests --- compression/src/tests.rs | 196 +++++++++++++-------------------------- 1 file changed, 62 insertions(+), 134 deletions(-) diff --git a/compression/src/tests.rs b/compression/src/tests.rs index 1cd501ba25..0d4f8f4f68 100644 --- a/compression/src/tests.rs +++ b/compression/src/tests.rs @@ -28,6 +28,7 @@ use ark_std::test_rng; use halo2_proofs::dev::MockProver; use crate::{params, CompressionCircuit}; use crate::circuit::to_ce_snark; +use aggregator::MockChunkCircuit; #[derive(Clone, Copy)] pub struct StandardPlonkConfig { @@ -179,9 +180,6 @@ fn test_standard_plonk_compression() { #[test] fn test_mock_compression() { - use crate::CompressionCircuit; - use aggregator::MockChunkCircuit; - let k0 = 8u32; let params_app = gen_srs(k0); @@ -206,6 +204,49 @@ fn test_mock_compression() { mock_prover.assert_satisfied_par() } +#[test] +fn test_two_layer_compression() { + // Generate base layer snark + let k0 = 8u32; + let params_app = gen_srs(k0); + let circuit = MockChunkCircuit::random(OsRng, false, false); + + let pk = gen_pk(¶ms_app, &circuit, None); + let mut rng = test_rng(); + let old_snark = old_gen_snark_shplonk(¶ms_app, &pk, circuit, &mut rng, None::).unwrap(); + + // First layer of compression + let k1 = 21u32; + let params = gen_srs(k1); + let mut rng = test_rng(); + let compression_circuit = + CompressionCircuit::new_from_ce_snark(k1, ¶ms, to_ce_snark(&old_snark), true, &mut rng).unwrap(); + let pk = gen_pk(¶ms, &compression_circuit, None); + let compression_snark = gen_snark_shplonk( + ¶ms, + &pk, + compression_circuit.clone(), + None::, + ); + + // Second layer of compression + let k2 = 21u32; + let params2 = gen_srs(k1); + let mut rng = test_rng(); + let compression_circuit_layer2 = + CompressionCircuit::new_from_ce_snark(k2, ¶ms2, compression_snark, true, &mut rng).unwrap(); + let pk = gen_pk(¶ms, &compression_circuit_layer2, None); + let compression_snark_layer2 = gen_snark_shplonk( + ¶ms2, + &pk, + compression_circuit_layer2.clone(), + None::, + ); + +// verify_compression_layer_evm(layer_1_snark, layer_2_params, k2, path, 2); + +} + // use crate::{circuit::to_ce_snark, CompressionCircuit}; // use ce_snark_verifier::{ // loader::halo2::halo2_ecc::halo2_base::{halo2_proofs, utils::fs::gen_srs}, @@ -221,49 +262,26 @@ fn test_mock_compression() { // use halo2curves::bn256::{Bn256, Fr}; // use std::{fs, path::Path, process}; -// #[test] -// fn test_two_layer_proof_compression() { -// env_logger::init(); - -// if std::path::Path::new("data").is_dir() { -// println!("data folder already exists\n"); -// } else { -// println!("Generating data folder used for testing\n"); -// std::fs::create_dir("data").unwrap(); -// } - -// let dir = format!("data/{}", process::id()); -// let path = Path::new(dir.as_str()); -// fs::create_dir(path).unwrap(); - -// let k0 = 19; -// let k1 = 25; -// let k2 = 25; - -// let mut rng = test_rng(); -// let layer_2_params = gen_srs(k2); - -// let circuit = MockChunkCircuit::random(&mut rng, false, false); -// let layer_0_snark = layer_0(&circuit, layer_2_params.clone(), k0, path); - -// std::env::set_var("COMPRESSION_CONFIG", "./configs/compression_wide.config"); -// let layer_1_snark = compression_layer_snark(layer_0_snark, layer_2_params.clone(), k1, 1); - -// std::env::set_var("COMPRESSION_CONFIG", "./configs/compression_thin.config"); -// verify_compression_layer_evm(layer_1_snark, layer_2_params, k2, path, 2); -// } - -// #[test] -// fn test_to_ce_snark() { -// let mut rng = test_rng(); -// let k0 = 8; +#[test] +fn test_to_ce_snark() { + let mut rng = test_rng(); + let k0 = 8; -// let path = Path::new("unused"); + let path = Path::new("unused"); -// let circuit = MockChunkCircuit::random(&mut rng, false, false); -// let base_snark = layer_0(&circuit, gen_srs(8), k0, path); -// assert_snark_roundtrip(&base_snark); -// } + let circuit = MockChunkCircuit::random(&mut rng, false, false); + let base_snark = layer_0(&circuit, gen_srs(8), k0, path); + assert_snark_roundtrip(&base_snark); +} +fn from_ce_snark(snark: &Snark) -> snark_verifier_sdk::Snark { + serde_json::from_str(&serde_json::to_string(snark).unwrap()).unwrap() +} +fn assert_snark_roundtrip(snark: &Snark) { + assert_eq!( + serde_json::to_string(snark).unwrap(), + serde_json::to_string(&to_ce_snark(&from_ce_snark(snark))).unwrap() + ); +} // #[test] // fn test_read_inner_snark() { @@ -273,99 +291,9 @@ fn test_mock_compression() { // to_ce_snark(&inner_snark); // } -// fn from_ce_snark(snark: &Snark) -> snark_verifier_sdk::Snark { -// serde_json::from_str(&serde_json::to_string(snark).unwrap()).unwrap() -// } - -// fn assert_snark_roundtrip(snark: &Snark) { -// assert_eq!( -// serde_json::to_string(snark).unwrap(), -// serde_json::to_string(&to_ce_snark(&from_ce_snark(snark))).unwrap() -// ); -// } - -// fn layer_0( -// circuit: &MockChunkCircuit, -// param: ParamsKZG, -// degree: u32, -// _path: &Path, -// ) -> Snark { -// let timer = start_timer!(|| "gen layer 0 snark"); - -// let param = { -// let mut param = param; -// param.downsize(degree); -// param -// }; - -// let pk = gen_pk(¶m, circuit, None); -// log::trace!("finished layer 0 pk generation for circuit"); - -// let snark = gen_snark_shplonk(¶m, &pk, circuit.clone(), None::); -// log::trace!("finished layer 0 snark generation for circuit"); - -// // assert!(verify_snark_shplonk(¶m, snark.clone(), pk.get_vk())); - -// log::trace!("finished layer 0 snark verification"); -// log::trace!("proof size: {}", snark.proof.len()); -// log::trace!( -// "pi size: {}", -// snark.instances.iter().map(|x| x.len()).sum::() -// ); - -// log::trace!("layer 0 circuit instances"); -// for (i, e) in circuit.instances()[0].iter().enumerate() { -// log::trace!("{}-th public input: {:?}", i, e); -// } -// end_timer!(timer); -// snark -// } - -// fn compression_layer_snark( -// previous_snark: Snark, -// param: ParamsKZG, -// degree: u32, -// layer_index: usize, -// ) -> Snark { -// let timer = start_timer!(|| format!("gen layer {} snark", layer_index)); - -// let param = { -// let mut param = param.clone(); -// param.downsize(degree); -// param -// }; - -// let compression_circuit = CompressionCircuit::new_from_ce_snark( -// ¶m, -// previous_snark.clone(), -// layer_index == 1, -// test_rng(), -// ) -// .unwrap(); -// let pk = gen_pk(¶m, &compression_circuit, None); -// // build the snark for next layer -// let snark = gen_snark_shplonk( -// ¶m, -// &pk, -// compression_circuit.clone(), -// // &mut rng, -// None::, // Some(&$path.join(Path::new("layer_1.snark"))), -// ); -// log::trace!( -// "finished layer {} snark generation for circuit", -// layer_index -// ); -// // assert!(verify_snark_shplonk::( -// // ¶m, -// // snark.clone(), -// // pk.get_vk() -// // )); -// end_timer!(timer); -// snark -// } // fn verify_compression_layer_evm( // previous_snark: Snark,