diff --git a/codex-plonky2-circuits/src/bn254_wrapper/wrap.rs b/codex-plonky2-circuits/src/bn254_wrapper/wrap.rs index faf37d2..86a282f 100755 --- a/codex-plonky2-circuits/src/bn254_wrapper/wrap.rs +++ b/codex-plonky2-circuits/src/bn254_wrapper/wrap.rs @@ -10,7 +10,7 @@ use plonky2::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget}; use plonky2_field::extension::Extendable; use serde::Serialize; use plonky2_poseidon2::Poseidon2; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; use crate::error::CircuitError; /// Wrap circuit - wraps the plonky2 proof with diff --git a/codex-plonky2-circuits/src/bundle/mod.rs b/codex-plonky2-circuits/src/bundle/mod.rs index 0badcfe..37c4fb6 100755 --- a/codex-plonky2-circuits/src/bundle/mod.rs +++ b/codex-plonky2-circuits/src/bundle/mod.rs @@ -5,7 +5,7 @@ use plonky2::plonk::config::{AlgebraicHasher, GenericConfig}; use plonky2::plonk::proof::ProofWithPublicInputs; use plonky2_field::extension::Extendable; use plonky2_poseidon2::Poseidon2; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; use crate::circuits::params::CircuitParams; use crate::circuits::sample_cells::{SampleCircuit, SampleCircuitInput, SampleTargets}; use crate::Result; diff --git a/codex-plonky2-circuits/src/circuit_helper/mod.rs b/codex-plonky2-circuits/src/circuit_trait/mod.rs similarity index 100% rename from codex-plonky2-circuits/src/circuit_helper/mod.rs rename to codex-plonky2-circuits/src/circuit_trait/mod.rs diff --git a/codex-plonky2-circuits/src/circuits/sample_cells.rs b/codex-plonky2-circuits/src/circuits/sample_cells.rs index dfcc8a6..8384fea 100755 --- a/codex-plonky2-circuits/src/circuits/sample_cells.rs +++ b/codex-plonky2-circuits/src/circuits/sample_cells.rs @@ -32,7 +32,7 @@ use crate::{ Result, error::CircuitError, }; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; use crate::circuits::serialization::SerializableHashOutTarget; /// circuit for sampling a slot in a dataset merkle tree diff --git a/codex-plonky2-circuits/src/lib.rs b/codex-plonky2-circuits/src/lib.rs index bc4c227..e70db39 100755 --- a/codex-plonky2-circuits/src/lib.rs +++ b/codex-plonky2-circuits/src/lib.rs @@ -1,7 +1,7 @@ pub mod circuits; pub mod recursion; pub mod error; -pub mod circuit_helper; +pub mod circuit_trait; mod bundle; pub mod bn254_wrapper; pub mod serialization; diff --git a/codex-plonky2-circuits/src/recursion/compress.rs b/codex-plonky2-circuits/src/recursion/compress.rs index 471e0e6..6942815 100755 --- a/codex-plonky2-circuits/src/recursion/compress.rs +++ b/codex-plonky2-circuits/src/recursion/compress.rs @@ -7,7 +7,7 @@ use plonky2::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget}; use plonky2_field::extension::Extendable; use plonky2_poseidon2::poseidon2_hash::poseidon2::Poseidon2; use crate::{error::CircuitError,Result}; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; /// recursion compression circuit /// verifies 1 inner proof and as result should shrink it diff --git a/codex-plonky2-circuits/src/recursion/leaf.rs b/codex-plonky2-circuits/src/recursion/leaf.rs index 9bdd682..c5590d6 100755 --- a/codex-plonky2-circuits/src/recursion/leaf.rs +++ b/codex-plonky2-circuits/src/recursion/leaf.rs @@ -9,7 +9,7 @@ use plonky2::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget}; use plonky2_field::extension::Extendable; use plonky2_poseidon2::poseidon2_hash::poseidon2::Poseidon2; use crate::{error::CircuitError,Result}; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; use crate::recursion::dummy_gen::DummyProofGen; use crate::recursion::utils::{bucket_count, compute_flag_buckets}; diff --git a/codex-plonky2-circuits/src/recursion/node.rs b/codex-plonky2-circuits/src/recursion/node.rs index 5de7713..14c8050 100755 --- a/codex-plonky2-circuits/src/recursion/node.rs +++ b/codex-plonky2-circuits/src/recursion/node.rs @@ -9,7 +9,7 @@ use plonky2::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget}; use plonky2_field::extension::Extendable; use plonky2_poseidon2::poseidon2_hash::poseidon2::Poseidon2; use crate::{error::CircuitError,Result}; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; use crate::recursion::dummy_gen::DummyProofGen; use crate::recursion::utils::bucket_count; diff --git a/codex-plonky2-circuits/src/recursion/pi_verifier.rs b/codex-plonky2-circuits/src/recursion/pi_verifier.rs index ebd8400..9f30d73 100755 --- a/codex-plonky2-circuits/src/recursion/pi_verifier.rs +++ b/codex-plonky2-circuits/src/recursion/pi_verifier.rs @@ -9,7 +9,7 @@ use plonky2::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget}; use plonky2_field::extension::Extendable; use plonky2_poseidon2::poseidon2_hash::poseidon2::Poseidon2; use crate::{error::CircuitError, Result}; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; /// A circuit that verifies the aggregated public inputs from inner circuits. /// - `N`: Number of leaf proofs aggregated at the node level. diff --git a/codex-plonky2-circuits/src/recursion/tree.rs b/codex-plonky2-circuits/src/recursion/tree.rs index 93c6bdd..c36f0eb 100755 --- a/codex-plonky2-circuits/src/recursion/tree.rs +++ b/codex-plonky2-circuits/src/recursion/tree.rs @@ -8,7 +8,7 @@ use plonky2_poseidon2::poseidon2_hash::poseidon2::Poseidon2; use plonky2_field::extension::Extendable; use crate::{error::CircuitError, Result}; use crate::bundle::Bundle; -use crate::circuit_helper::Plonky2Circuit; +use crate::circuit_trait::Plonky2Circuit; use crate::recursion::{leaf::{LeafTargets, LeafCircuit}, node::{NodeTargets, NodeCircuit}}; use crate::recursion::compress::{CompressionCircuit, CompressionInput, CompressionTargets}; use crate::recursion::leaf::LeafInput; diff --git a/proof-input/tests/sampling.rs b/proof-input/tests/sampling.rs index 192918f..26bf34c 100644 --- a/proof-input/tests/sampling.rs +++ b/proof-input/tests/sampling.rs @@ -28,7 +28,7 @@ mod sampling_circuit_tests { use super::*; use std::time::Instant; use plonky2::plonk::proof::ProofWithPublicInputs; - use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; + use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit; use proof_input::input_generator::InputGenerator; use proof_input::params::Params; diff --git a/proof-input/tests/serialization.rs b/proof-input/tests/serialization.rs index e7baeab..9e4225a 100644 --- a/proof-input/tests/serialization.rs +++ b/proof-input/tests/serialization.rs @@ -14,7 +14,7 @@ mod serialization_tests { use super::*; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput}; use plonky2::plonk::circuit_data::{CircuitConfig, ProverCircuitData, VerifierCircuitData}; - use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; + use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use proof_input::input_generator::InputGenerator; use proof_input::input_generator::serialization::{export_circ_input_to_json, import_circ_input_from_json}; use std::path::Path; diff --git a/proof-input/tests/tree_circuit.rs b/proof-input/tests/tree_circuit.rs index ddf8ce3..9fe56ee 100644 --- a/proof-input/tests/tree_circuit.rs +++ b/proof-input/tests/tree_circuit.rs @@ -8,7 +8,7 @@ use plonky2::plonk::config::PoseidonGoldilocksConfig; use plonky2::plonk::proof::ProofWithPublicInputs; use plonky2_field::goldilocks_field::GoldilocksField; use plonky2_field::types::{Field, PrimeField64}; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit; use codex_plonky2_circuits::recursion::leaf::{LeafCircuit, LeafInput, BUCKET_SIZE}; use proof_input::input_generator::InputGenerator; @@ -197,7 +197,7 @@ pub mod leaf_tests { mod node_tests { use plonky2::plonk::circuit_data::VerifierCircuitData; use plonky2::plonk::proof::ProofWithPublicInputs; - use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; + use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::recursion::node::{NodeCircuit, NodeInput}; use super::*; @@ -391,7 +391,7 @@ mod bn254wrap_tests { use plonky2::plonk::proof::ProofWithPublicInputs; use codex_plonky2_circuits::bn254_wrapper::config::PoseidonBN254GoldilocksConfig; use codex_plonky2_circuits::bn254_wrapper::wrap::{WrapCircuit, WrapInput, WrappedOutput}; - use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; + use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::recursion::tree::TreeRecursion; use super::*; diff --git a/workflow/benches/compression.rs b/workflow/benches/compression.rs index ccb67be..b450bcb 100644 --- a/workflow/benches/compression.rs +++ b/workflow/benches/compression.rs @@ -5,7 +5,7 @@ use plonky2::hash::hash_types::HashOut; use plonky2::iop::witness::{PartialWitness, WitnessWrite}; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::{CircuitConfig, VerifierCircuitData}; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::recursion::uniform::compress::{CompressionCircuit, CompressionInput}; use codex_plonky2_circuits::recursion::uniform::tree::get_hash_of_verifier_data; diff --git a/workflow/benches/sample_cells.rs b/workflow/benches/sample_cells.rs index 1dc7a89..35b6d1b 100644 --- a/workflow/benches/sample_cells.rs +++ b/workflow/benches/sample_cells.rs @@ -1,7 +1,7 @@ use anyhow::Result; use criterion::{criterion_group, criterion_main, Criterion}; use plonky2::plonk::circuit_data::{CircuitData, VerifierCircuitData}; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::circuits::sample_cells::SampleCircuit; use proof_input::gen_input::gen_testing_circuit_input; diff --git a/workflow/benches/uniform_recursion.rs b/workflow/benches/uniform_recursion.rs index 7edddfd..b0a560b 100644 --- a/workflow/benches/uniform_recursion.rs +++ b/workflow/benches/uniform_recursion.rs @@ -1,6 +1,6 @@ use criterion::{Criterion, criterion_group, criterion_main}; use plonky2::plonk::proof::ProofWithPublicInputs; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit}; use codex_plonky2_circuits::recursion::uniform::tree::TreeRecursion; use proof_input::params::{C, D, F,HF}; diff --git a/workflow/src/bn254_wrap.rs b/workflow/src/bn254_wrap.rs index 686624f..5282952 100755 --- a/workflow/src/bn254_wrap.rs +++ b/workflow/src/bn254_wrap.rs @@ -2,7 +2,7 @@ use std::time::Instant; use anyhow::Result; use codex_plonky2_circuits::bn254_wrapper::config::PoseidonBN254GoldilocksConfig; use codex_plonky2_circuits::bn254_wrapper::wrap::{WrapCircuit, WrapInput, WrappedOutput}; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +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::file_paths::WRAP_CIRC_BASE_PATH; diff --git a/workflow/src/build_circ.rs b/workflow/src/build_circ.rs index 75b58e6..62a13fe 100755 --- a/workflow/src/build_circ.rs +++ b/workflow/src/build_circ.rs @@ -1,6 +1,6 @@ use std::time::Instant; use anyhow::Result; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +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; diff --git a/workflow/src/prove.rs b/workflow/src/prove.rs index fc00b2b..8d0c907 100755 --- a/workflow/src/prove.rs +++ b/workflow/src/prove.rs @@ -1,6 +1,6 @@ use anyhow::Result; use std::time::Instant; -use codex_plonky2_circuits::circuit_helper::Plonky2Circuit; +use codex_plonky2_circuits::circuit_trait::Plonky2Circuit; use proof_input::serialization::circuit_input::{import_circ_input_from_json}; use codex_plonky2_circuits::circuits::sample_cells::{SampleCircuit, SampleCircuitInput, SampleTargets}; use codex_plonky2_circuits::circuits::params::CircuitParams;