From 2cf92cfedf4ca2a1d6f00a871317bbc909dc34bb Mon Sep 17 00:00:00 2001 From: M Alghazwi Date: Fri, 10 Jan 2025 11:30:34 +0100 Subject: [PATCH] refactor imports --- workflow/benches/safe_circuit.rs | 4 ++-- workflow/benches/tree_recursion_approach1.rs | 4 ++-- workflow/benches/tree_recursion_approach2.rs | 4 ++-- workflow/src/bin/build_circ.rs | 2 +- workflow/src/bin/gen_input.rs | 2 +- workflow/src/bin/prove.rs | 4 ++-- workflow/src/bin/prove_and_verify.rs | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/workflow/benches/safe_circuit.rs b/workflow/benches/safe_circuit.rs index bfdc898..d5248fc 100644 --- a/workflow/benches/safe_circuit.rs +++ b/workflow/benches/safe_circuit.rs @@ -15,8 +15,8 @@ use std::marker::PhantomData; use plonky2::plonk::circuit_builder::CircuitBuilder; use codex_plonky2_circuits::merkle_tree::merkle_safe::MerkleProof; use plonky2_field::goldilocks_field::GoldilocksField; -use proof_input::tests::merkle_circuit; -use proof_input::tests::merkle_circuit::{assign_witness, MerkleTreeCircuitInput}; +use proof_input::recursion::merkle_circuit; +use proof_input::recursion::merkle_circuit::{assign_witness, MerkleTreeCircuitInput}; use proof_input::utils::usize_to_bits_le; macro_rules! pretty_print { diff --git a/workflow/benches/tree_recursion_approach1.rs b/workflow/benches/tree_recursion_approach1.rs index cc0a763..70d601a 100644 --- a/workflow/benches/tree_recursion_approach1.rs +++ b/workflow/benches/tree_recursion_approach1.rs @@ -2,9 +2,9 @@ use anyhow::anyhow; use criterion::{Criterion, criterion_group, criterion_main}; use plonky2::plonk::config::GenericConfig; use plonky2::plonk::proof::ProofWithPublicInputs; -use codex_plonky2_circuits::recursion::sampling_inner_circuit::SamplingRecursion; +use codex_plonky2_circuits::recursion::circuits::sampling_inner_circuit::SamplingRecursion; use codex_plonky2_circuits::recursion::tree_recursion::{NodeCircuit, TreeRecursion}; -use codex_plonky2_circuits::recursion::params::{C, D, F}; +use codex_plonky2_circuits::params::{C, D, F}; use proof_input::gen_input::get_m_default_circ_input; diff --git a/workflow/benches/tree_recursion_approach2.rs b/workflow/benches/tree_recursion_approach2.rs index 4aa3d40..1025a27 100644 --- a/workflow/benches/tree_recursion_approach2.rs +++ b/workflow/benches/tree_recursion_approach2.rs @@ -7,9 +7,9 @@ use plonky2::plonk::proof::ProofWithPublicInputs; use codex_plonky2_circuits::circuits::params::CircuitParams; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput}; use codex_plonky2_circuits::recursion::leaf_circuit::{LeafCircuit, LeafInput}; -use codex_plonky2_circuits::recursion::sampling_inner_circuit::SamplingRecursion; +use codex_plonky2_circuits::recursion::circuits::sampling_inner_circuit::SamplingRecursion; use codex_plonky2_circuits::recursion::tree_recursion2::{NodeCircuit, TreeRecursion}; -use codex_plonky2_circuits::recursion::params::{C, D, F}; +use codex_plonky2_circuits::params::{C, D, F}; use proof_input::gen_input::gen_testing_circuit_input; use proof_input::params::TestParams; diff --git a/workflow/src/bin/build_circ.rs b/workflow/src/bin/build_circ.rs index f661375..a2d4026 100644 --- a/workflow/src/bin/build_circ.rs +++ b/workflow/src/bin/build_circ.rs @@ -5,7 +5,7 @@ use anyhow::Result; use std::time::Instant; use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit; use plonky2_poseidon2::serialization::{DefaultGateSerializer,DefaultGeneratorSerializer}; -use proof_input::json::write_bytes_to_file; +use proof_input::serialization::json::write_bytes_to_file; use proof_input::params::Params; use proof_input::params::{D, C, F}; diff --git a/workflow/src/bin/gen_input.rs b/workflow/src/bin/gen_input.rs index 9cf57bf..1a8bd84 100644 --- a/workflow/src/bin/gen_input.rs +++ b/workflow/src/bin/gen_input.rs @@ -1,6 +1,6 @@ use plonky2::plonk::config::GenericConfig; use anyhow::Result; -use proof_input::json::export_circ_input_to_json; +use proof_input::serialization::circuit_input::export_circ_input_to_json; use proof_input::gen_input::gen_testing_circuit_input; use proof_input::params::Params; use proof_input::params::{D, F}; diff --git a/workflow/src/bin/prove.rs b/workflow/src/bin/prove.rs index cd2476f..aa822ac 100644 --- a/workflow/src/bin/prove.rs +++ b/workflow/src/bin/prove.rs @@ -5,7 +5,7 @@ use plonky2::plonk::circuit_builder::CircuitBuilder; use anyhow::Result; use std::time::Instant; -use proof_input::json::import_circ_input_from_json; +use proof_input::serialization::circuit_input::import_circ_input_from_json; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput}; use codex_plonky2_circuits::circuits::params::CircuitParams; use proof_input::params::{D, C, F}; @@ -22,7 +22,7 @@ fn main() -> Result<()> { let config = CircuitConfig::standard_recursion_config(); let mut builder = CircuitBuilder::::new(config); let circ = SampleCircuit::new(circuit_params); - let mut targets = circ.sample_slot_circuit_with_public_input(&mut builder); + let mut targets = circ.sample_slot_circuit_with_public_input(&mut builder)?; // Create a PartialWitness and assign let mut pw = PartialWitness::new(); diff --git a/workflow/src/bin/prove_and_verify.rs b/workflow/src/bin/prove_and_verify.rs index 8c5278b..26cdf8f 100644 --- a/workflow/src/bin/prove_and_verify.rs +++ b/workflow/src/bin/prove_and_verify.rs @@ -5,7 +5,7 @@ use plonky2::plonk::circuit_builder::CircuitBuilder; use anyhow::Result; use std::time::Instant; -use proof_input::json::import_circ_input_from_json; +use proof_input::serialization::circuit_input::import_circ_input_from_json; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput}; use codex_plonky2_circuits::circuits::params::CircuitParams; use proof_input::params::{D, C, F}; @@ -23,12 +23,12 @@ fn main() -> Result<()> { let mut builder = CircuitBuilder::::new(config); let circ = SampleCircuit::new(circuit_params); - let mut targets = circ.sample_slot_circuit_with_public_input(&mut builder); + let mut targets = circ.sample_slot_circuit_with_public_input(&mut builder)?; // Create a PartialWitness and assign let mut pw = PartialWitness::new(); - circ.sample_slot_assign_witness(&mut pw, &targets, &circ_input); + circ.sample_slot_assign_witness(&mut pw, &targets, &circ_input)?; // Build the circuit let build_time = Instant::now();