move test types and refactor.

This commit is contained in:
M Alghazwi 2025-07-10 12:26:04 +02:00
parent 9c703dcf2a
commit aa9740a98d
No known key found for this signature in database
GPG Key ID: 646E567CAD7DB607
8 changed files with 23 additions and 11 deletions

View File

@ -3,7 +3,7 @@ use std::time::Instant;
use anyhow::{Context, Result};
use plonky2::plonk::proof::ProofWithPublicInputs;
use codex_plonky2_circuits::recursion::tree::TreeRecursion;
use proof_input::params::{D, C, F, HF};
use crate::params::{D, C, F, H};
use codex_plonky2_circuits::serialization::{export_proof_with_pi, export_verifier_circuit_data, import_proof_with_pi, import_verifier_circuit_data};
use crate::file_paths::{SAMPLING_CIRC_BASE_PATH, TREE_CIRC_BASE_PATH, COMPRESS_CIRC_BASE_PATH};
pub fn run(compress: bool) -> Result<()> {
@ -48,7 +48,7 @@ fn run_tree<const N: usize, const T: usize>(compress: bool) -> Result<()> {
let proofs: Vec<ProofWithPublicInputs<F, C, D>> = (0..T).map(|_i| proof_with_pi.clone()).collect();
let start_time = Instant::now();
let mut tree = TreeRecursion::<F,D,C,HF, N, T>::build_with_standard_config(verifier_data.clone()).unwrap();
let mut tree = TreeRecursion::<F,D,C,H, N, T>::build_with_standard_config(verifier_data.clone()).unwrap();
println!("build tree time: {:?}", start_time.elapsed());
let start_time = Instant::now();

View File

@ -4,7 +4,7 @@ use codex_plonky2_circuits::bn254_wrapper::config::PoseidonBN254GoldilocksConfig
use codex_plonky2_circuits::bn254_wrapper::wrap::{WrapCircuit, WrapInput, WrappedOutput};
use codex_plonky2_circuits::circuit_trait::Plonky2Circuit;
use codex_plonky2_circuits::serialization::{export_verifier_circuit_data, import_proof_with_pi, import_verifier_circuit_data};
use proof_input::params::{D, C, F};
use crate::params::{D, C, F};
use crate::file_paths::WRAP_CIRC_BASE_PATH;
type OuterParameters = PoseidonBN254GoldilocksConfig;

View File

@ -4,7 +4,7 @@ use codex_plonky2_circuits::circuit_trait::Plonky2Circuit;
use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit;
use codex_plonky2_circuits::serialization::export_circuit_data;
use proof_input::params::Params;
use proof_input::params::{D, C, F,HF};
use crate::params::{D, C, F, H};
use crate::file_paths::SAMPLING_CIRC_BASE_PATH;
pub fn run() -> Result<()> {
@ -13,7 +13,7 @@ pub fn run() -> Result<()> {
// Create the circuit
let circuit_params = params.circuit_params;
let circ = SampleCircuit::<F,D,HF>::new(circuit_params);
let circ = SampleCircuit::<F,D,H>::new(circuit_params);
let start_time = Instant::now();
let (targets, data) = circ.build_with_standard_config()?;
println!("Build time: {:?}", start_time.elapsed());

View File

@ -3,7 +3,7 @@ use anyhow::Result;
use proof_input::input_generator::serialization::export_circ_input_to_json;
use proof_input::input_generator::InputGenerator;
use proof_input::params::Params;
use proof_input::params::{D, F, HF};
use crate::params::{D, H, F};
use crate::file_paths::SAMPLING_CIRC_BASE_PATH;
pub fn run() -> Result<()> {
@ -12,7 +12,7 @@ pub fn run() -> Result<()> {
// generate circuit input with given parameters
let start_time = Instant::now();
let input_gen = InputGenerator::<F,D,HF>::new(params.input_params);
let input_gen = InputGenerator::<F,D,H>::new(params.input_params);
let circ_input = input_gen.gen_testing_circuit_input();
println!("Generating input time: {:?}", start_time.elapsed());

View File

@ -2,7 +2,8 @@ use anyhow::Result;
use clap::{Parser, Subcommand};
use codex_plonky2_circuits::bn254_wrapper::config::PoseidonBN254GoldilocksConfig;
use crate::file_paths::{COMPRESS_CIRC_BASE_PATH, SAMPLING_CIRC_BASE_PATH, TREE_CIRC_BASE_PATH, WRAP_CIRC_BASE_PATH};
use proof_input::params::C;
use crate::params::C;
type OuterParameters = PoseidonBN254GoldilocksConfig;
mod build_circ;
@ -12,6 +13,7 @@ mod gen_input;
mod aggregate;
mod bn254_wrap;
mod file_paths;
mod params;
/// Codex_zk_cli: unified CLI for all zk operations
#[derive(Parser)]

10
workflow/src/params.rs Normal file
View File

@ -0,0 +1,10 @@
use plonky2::hash::poseidon::PoseidonHash;
use plonky2::plonk::config::PoseidonGoldilocksConfig;
use plonky2_field::goldilocks_field::GoldilocksField;
// test types
// TODO: take these from cli args
pub const D: usize = 2;
pub type F = GoldilocksField;
pub type C = PoseidonGoldilocksConfig;
pub type H = PoseidonHash;

View File

@ -4,7 +4,7 @@ use codex_plonky2_circuits::circuit_trait::Plonky2Circuit;
use proof_input::input_generator::serialization::{import_circ_input_from_json};
use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput, SampleTargets};
use codex_plonky2_circuits::circuits::params::CircuitParams;
use proof_input::params::{D, C, F, HF};
use crate::params::{D, C, F, H};
use codex_plonky2_circuits::serialization::{export_proof_with_pi, import_prover_circuit_data, import_targets};
use crate::file_paths::SAMPLING_CIRC_BASE_PATH;
pub fn run() -> Result<()> {
@ -25,7 +25,7 @@ pub fn run() -> Result<()> {
println!("Circuit size (degree bits): {:?}", prover_data.common.degree_bits());
// Prove the circuit with the assigned witness
let circ = SampleCircuit::<F,D,HF>::new(circuit_params);
let circ = SampleCircuit::<F,D,H>::new(circuit_params);
let start_time = Instant::now();
let proof_with_pis = circ.prove(&circ_targets, &circ_input, &prover_data)?;
println!("Proving time: {:?}", start_time.elapsed());

View File

@ -2,7 +2,7 @@ use std::time::Instant;
use anyhow::Result;
use plonky2::plonk::config::GenericConfig;
use serde::Serialize;
use proof_input::params::{D, F};
use crate::params::{D, F};
use codex_plonky2_circuits::serialization::{import_proof_with_pi, import_verifier_circuit_data};
pub fn run<