refactor imports

This commit is contained in:
M Alghazwi 2025-01-10 11:30:34 +01:00
parent 72cc4699f3
commit 2cf92cfedf
No known key found for this signature in database
GPG Key ID: 646E567CAD7DB607
7 changed files with 13 additions and 13 deletions

View File

@ -15,8 +15,8 @@ use std::marker::PhantomData;
use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_builder::CircuitBuilder;
use codex_plonky2_circuits::merkle_tree::merkle_safe::MerkleProof; use codex_plonky2_circuits::merkle_tree::merkle_safe::MerkleProof;
use plonky2_field::goldilocks_field::GoldilocksField; use plonky2_field::goldilocks_field::GoldilocksField;
use proof_input::tests::merkle_circuit; use proof_input::recursion::merkle_circuit;
use proof_input::tests::merkle_circuit::{assign_witness, MerkleTreeCircuitInput}; use proof_input::recursion::merkle_circuit::{assign_witness, MerkleTreeCircuitInput};
use proof_input::utils::usize_to_bits_le; use proof_input::utils::usize_to_bits_le;
macro_rules! pretty_print { macro_rules! pretty_print {

View File

@ -2,9 +2,9 @@ use anyhow::anyhow;
use criterion::{Criterion, criterion_group, criterion_main}; use criterion::{Criterion, criterion_group, criterion_main};
use plonky2::plonk::config::GenericConfig; use plonky2::plonk::config::GenericConfig;
use plonky2::plonk::proof::ProofWithPublicInputs; 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::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; use proof_input::gen_input::get_m_default_circ_input;

View File

@ -7,9 +7,9 @@ use plonky2::plonk::proof::ProofWithPublicInputs;
use codex_plonky2_circuits::circuits::params::CircuitParams; use codex_plonky2_circuits::circuits::params::CircuitParams;
use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput}; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput};
use codex_plonky2_circuits::recursion::leaf_circuit::{LeafCircuit, LeafInput}; 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::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::gen_input::gen_testing_circuit_input;
use proof_input::params::TestParams; use proof_input::params::TestParams;

View File

@ -5,7 +5,7 @@ use anyhow::Result;
use std::time::Instant; use std::time::Instant;
use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit; use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit;
use plonky2_poseidon2::serialization::{DefaultGateSerializer,DefaultGeneratorSerializer}; 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::Params;
use proof_input::params::{D, C, F}; use proof_input::params::{D, C, F};

View File

@ -1,6 +1,6 @@
use plonky2::plonk::config::GenericConfig; use plonky2::plonk::config::GenericConfig;
use anyhow::Result; 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::gen_input::gen_testing_circuit_input;
use proof_input::params::Params; use proof_input::params::Params;
use proof_input::params::{D, F}; use proof_input::params::{D, F};

View File

@ -5,7 +5,7 @@ use plonky2::plonk::circuit_builder::CircuitBuilder;
use anyhow::Result; use anyhow::Result;
use std::time::Instant; 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::sample_cells::{SampleCircuit, SampleCircuitInput};
use codex_plonky2_circuits::circuits::params::CircuitParams; use codex_plonky2_circuits::circuits::params::CircuitParams;
use proof_input::params::{D, C, F}; use proof_input::params::{D, C, F};
@ -22,7 +22,7 @@ fn main() -> Result<()> {
let config = CircuitConfig::standard_recursion_config(); let config = CircuitConfig::standard_recursion_config();
let mut builder = CircuitBuilder::<F, D>::new(config); let mut builder = CircuitBuilder::<F, D>::new(config);
let circ = SampleCircuit::new(circuit_params); 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 // Create a PartialWitness and assign
let mut pw = PartialWitness::new(); let mut pw = PartialWitness::new();

View File

@ -5,7 +5,7 @@ use plonky2::plonk::circuit_builder::CircuitBuilder;
use anyhow::Result; use anyhow::Result;
use std::time::Instant; 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::sample_cells::{SampleCircuit, SampleCircuitInput};
use codex_plonky2_circuits::circuits::params::CircuitParams; use codex_plonky2_circuits::circuits::params::CircuitParams;
use proof_input::params::{D, C, F}; use proof_input::params::{D, C, F};
@ -23,12 +23,12 @@ fn main() -> Result<()> {
let mut builder = CircuitBuilder::<F, D>::new(config); let mut builder = CircuitBuilder::<F, D>::new(config);
let circ = SampleCircuit::new(circuit_params); 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 // Create a PartialWitness and assign
let mut pw = PartialWitness::new(); 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 // Build the circuit
let build_time = Instant::now(); let build_time = Instant::now();