From 5563176bad191dc8a7034d1e9c3cc7de742b0e46 Mon Sep 17 00:00:00 2001 From: Sebastien La Duca Date: Tue, 2 Aug 2022 16:20:58 -0400 Subject: [PATCH 1/3] make rest of gates public --- plonky2/src/gates/exponentiation.rs | 2 +- plonky2/src/gates/interpolation.rs | 2 +- plonky2/src/gates/low_degree_interpolation.rs | 2 +- plonky2/src/gates/random_access.rs | 2 +- plonky2/src/gates/selectors.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plonky2/src/gates/exponentiation.rs b/plonky2/src/gates/exponentiation.rs index db12d697..aa977308 100644 --- a/plonky2/src/gates/exponentiation.rs +++ b/plonky2/src/gates/exponentiation.rs @@ -23,7 +23,7 @@ use crate::plonk::vars::{ /// A gate for raising a value to a power. #[derive(Clone, Debug)] -pub(crate) struct ExponentiationGate, const D: usize> { +pub struct ExponentiationGate, const D: usize> { pub num_power_bits: usize, pub _phantom: PhantomData, } diff --git a/plonky2/src/gates/interpolation.rs b/plonky2/src/gates/interpolation.rs index c98f7fe3..1983e5aa 100644 --- a/plonky2/src/gates/interpolation.rs +++ b/plonky2/src/gates/interpolation.rs @@ -22,7 +22,7 @@ use crate::plonk::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase}; /// Interpolation gate with constraints of degree at most `1<, const D: usize> { +pub struct HighDegreeInterpolationGate, const D: usize> { pub subgroup_bits: usize, _phantom: PhantomData, } diff --git a/plonky2/src/gates/low_degree_interpolation.rs b/plonky2/src/gates/low_degree_interpolation.rs index 4852792a..217f4f0a 100644 --- a/plonky2/src/gates/low_degree_interpolation.rs +++ b/plonky2/src/gates/low_degree_interpolation.rs @@ -23,7 +23,7 @@ use crate::plonk::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase}; /// Interpolation gate with constraints of degree 2. /// `eval_unfiltered_recursively` uses more gates than `HighDegreeInterpolationGate`. #[derive(Copy, Clone, Debug)] -pub(crate) struct LowDegreeInterpolationGate, const D: usize> { +pub struct LowDegreeInterpolationGate, const D: usize> { pub subgroup_bits: usize, _phantom: PhantomData, } diff --git a/plonky2/src/gates/random_access.rs b/plonky2/src/gates/random_access.rs index b1f1d529..2df392bc 100644 --- a/plonky2/src/gates/random_access.rs +++ b/plonky2/src/gates/random_access.rs @@ -23,7 +23,7 @@ use crate::plonk::vars::{ /// A gate for checking that a particular element of a list matches a given value. #[derive(Copy, Clone, Debug)] -pub(crate) struct RandomAccessGate, const D: usize> { +pub struct RandomAccessGate, const D: usize> { pub bits: usize, pub num_copies: usize, pub num_extra_constants: usize, diff --git a/plonky2/src/gates/selectors.rs b/plonky2/src/gates/selectors.rs index fff5d967..f1214a93 100644 --- a/plonky2/src/gates/selectors.rs +++ b/plonky2/src/gates/selectors.rs @@ -10,7 +10,7 @@ use crate::hash::hash_types::RichField; pub(crate) const UNUSED_SELECTOR: usize = u32::MAX as usize; #[derive(Debug, Clone)] -pub(crate) struct SelectorsInfo { +pub struct SelectorsInfo { pub(crate) selector_indices: Vec, pub(crate) groups: Vec>, } From 243bc09293edb630422c070670dabd03350b4fd7 Mon Sep 17 00:00:00 2001 From: Sebastien La Duca Date: Tue, 2 Aug 2022 16:42:37 -0400 Subject: [PATCH 2/3] make modules public --- plonky2/src/gates/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plonky2/src/gates/mod.rs b/plonky2/src/gates/mod.rs index d02f2978..e78e1e9d 100644 --- a/plonky2/src/gates/mod.rs +++ b/plonky2/src/gates/mod.rs @@ -14,12 +14,12 @@ pub mod multiplication_extension; pub mod noop; pub mod packed_util; pub mod poseidon; -pub(crate) mod poseidon_mds; -pub(crate) mod public_input; +pub mod poseidon_mds; +pub mod public_input; pub mod random_access; pub mod reducing; pub mod reducing_extension; -pub(crate) mod selectors; +pub mod selectors; pub mod util; // Can't use #[cfg(test)] here because it needs to be visible to other crates. From 8c515b4f2c133edb00b888c4e5a78958d393e39e Mon Sep 17 00:00:00 2001 From: Sebastien La Duca Date: Tue, 2 Aug 2022 17:12:27 -0400 Subject: [PATCH 3/3] selectors can stay pub(crate) --- plonky2/src/gates/mod.rs | 2 +- plonky2/src/gates/selectors.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plonky2/src/gates/mod.rs b/plonky2/src/gates/mod.rs index e78e1e9d..786ba12c 100644 --- a/plonky2/src/gates/mod.rs +++ b/plonky2/src/gates/mod.rs @@ -19,7 +19,7 @@ pub mod public_input; pub mod random_access; pub mod reducing; pub mod reducing_extension; -pub mod selectors; +pub(crate) mod selectors; pub mod util; // Can't use #[cfg(test)] here because it needs to be visible to other crates. diff --git a/plonky2/src/gates/selectors.rs b/plonky2/src/gates/selectors.rs index f1214a93..fff5d967 100644 --- a/plonky2/src/gates/selectors.rs +++ b/plonky2/src/gates/selectors.rs @@ -10,7 +10,7 @@ use crate::hash::hash_types::RichField; pub(crate) const UNUSED_SELECTOR: usize = u32::MAX as usize; #[derive(Debug, Clone)] -pub struct SelectorsInfo { +pub(crate) struct SelectorsInfo { pub(crate) selector_indices: Vec, pub(crate) groups: Vec>, }