cleaned up prover exports

facebook · Oct 29, 2023 · 772e6ad · 772e6ad
1 parent bbdc978
commit 772e6ad
Show file tree

Hide file tree

Showing 35 changed files with 176 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -237,8 +237,9 @@ like:
 use winterfell::{
     crypto::{hashers::Blake3_256, DefaultRandomCoin},
     math::{fields::f128::BaseElement, FieldElement},
+    matrix::ColMatrix,
     DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, Trace,
-    TracePolyTable, TraceTable,
+    TraceInfo, TracePolyTable, TraceTable,
 };
 
 // We'll use BLAKE3 as the hash function during proof generation.
@@ -282,8 +283,8 @@ impl Prover for WorkProver {
     // We'll use the default trace low-degree extension.
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)

diff --git a/examples/src/fibonacci/fib2/mod.rs b/examples/src/fibonacci/fib2/mod.rs
@@ -11,8 +11,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/fib2/prover.rs b/examples/src/fibonacci/fib2/prover.rs
@@ -4,9 +4,13 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{
-    BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    FibAir, FieldElement, PhantomData, ProofOptions, Prover, StarkDomain, Trace, TracePolyTable,
-    TraceTable, TRACE_WIDTH,
+    BaseElement, DefaultRandomCoin, ElementHasher, FibAir, FieldElement, PhantomData, ProofOptions,
+    Prover, TRACE_WIDTH,
+};
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
+    TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -70,8 +74,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -80,8 +84,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/fibonacci/fib8/mod.rs b/examples/src/fibonacci/fib8/mod.rs
@@ -11,8 +11,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/fib8/prover.rs b/examples/src/fibonacci/fib8/prover.rs
@@ -4,8 +4,12 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{
-    BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    Fib8Air, FieldElement, PhantomData, ProofOptions, Prover, StarkDomain, Trace, TracePolyTable,
+    BaseElement, DefaultRandomCoin, ElementHasher, Fib8Air, FieldElement, PhantomData,
+    ProofOptions, Prover,
+};
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
     TraceTable,
 };
 
@@ -85,8 +89,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -95,8 +99,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/fibonacci/fib_small/mod.rs b/examples/src/fibonacci/fib_small/mod.rs
@@ -11,8 +11,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f64::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/fib_small/prover.rs b/examples/src/fibonacci/fib_small/prover.rs
@@ -3,9 +3,13 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 use super::{
-    air::FibSmall, BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde,
-    ElementHasher, FieldElement, PhantomData, ProofOptions, Prover, StarkDomain, Trace,
-    TracePolyTable, TraceTable, TRACE_WIDTH,
+    air::FibSmall, BaseElement, DefaultRandomCoin, ElementHasher, FieldElement, PhantomData,
+    ProofOptions, Prover, TRACE_WIDTH,
+};
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
+    TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -69,8 +73,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -79,8 +83,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/fibonacci/mulfib2/mod.rs b/examples/src/fibonacci/mulfib2/mod.rs
@@ -11,8 +11,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/mulfib2/prover.rs b/examples/src/fibonacci/mulfib2/prover.rs
@@ -4,9 +4,13 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{
-    BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    FieldElement, MulFib2Air, PhantomData, ProofOptions, Prover, StarkDomain, Trace,
-    TracePolyTable, TraceTable,
+    BaseElement, DefaultRandomCoin, ElementHasher, FieldElement, MulFib2Air, PhantomData,
+    ProofOptions, Prover,
+};
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
+    TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -66,8 +70,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -76,8 +80,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/fibonacci/mulfib8/mod.rs b/examples/src/fibonacci/mulfib8/mod.rs
@@ -11,8 +11,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/mulfib8/prover.rs b/examples/src/fibonacci/mulfib8/prover.rs
@@ -4,9 +4,13 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{
-    BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    FieldElement, MulFib8Air, PhantomData, ProofOptions, Prover, StarkDomain, Trace,
-    TracePolyTable, TraceTable,
+    BaseElement, DefaultRandomCoin, ElementHasher, FieldElement, MulFib8Air, PhantomData,
+    ProofOptions, Prover,
+};
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
+    TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -78,8 +82,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -88,8 +92,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/lamport/aggregate/mod.rs b/examples/src/lamport/aggregate/mod.rs
@@ -13,8 +13,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, get_power_series, FieldElement, StarkField},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/lamport/aggregate/prover.rs b/examples/src/lamport/aggregate/prover.rs
@@ -4,11 +4,15 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{
-    get_power_series, rescue, BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin,
-    DefaultTraceLde, ElementHasher, FieldElement, LamportAggregateAir, PhantomData, ProofOptions,
-    Prover, PublicInputs, Signature, StarkDomain, StarkField, TracePolyTable, TraceTable,
+    get_power_series, rescue, BaseElement, DefaultRandomCoin, ElementHasher, FieldElement,
+    LamportAggregateAir, PhantomData, ProofOptions, Prover, PublicInputs, Signature, StarkField,
     CYCLE_LENGTH, NUM_HASH_ROUNDS, SIG_CYCLE_LENGTH, TRACE_WIDTH,
 };
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, TraceInfo, TracePolyTable,
+    TraceTable,
+};
 
 #[cfg(feature = "concurrent")]
 use winterfell::iterators::*;
@@ -112,8 +116,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -122,8 +126,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/lamport/threshold/mod.rs b/examples/src/lamport/threshold/mod.rs
@@ -14,8 +14,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, get_power_series, FieldElement, StarkField},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod signature;

diff --git a/examples/src/lamport/threshold/prover.rs b/examples/src/lamport/threshold/prover.rs
@@ -4,12 +4,16 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{
-    get_power_series, rescue, AggPublicKey, BaseElement, DefaultConstraintEvaluator,
-    DefaultRandomCoin, DefaultTraceLde, ElementHasher, FieldElement, LamportThresholdAir,
-    PhantomData, ProofOptions, Prover, PublicInputs, Signature, StarkDomain, StarkField,
-    TracePolyTable, TraceTable, HASH_CYCLE_LENGTH, NUM_HASH_ROUNDS, SIG_CYCLE_LENGTH, TRACE_WIDTH,
+    get_power_series, rescue, AggPublicKey, BaseElement, DefaultRandomCoin, ElementHasher,
+    FieldElement, LamportThresholdAir, PhantomData, ProofOptions, Prover, PublicInputs, Signature,
+    StarkField, HASH_CYCLE_LENGTH, NUM_HASH_ROUNDS, SIG_CYCLE_LENGTH, TRACE_WIDTH,
 };
 use std::collections::HashMap;
+use winterfell::{
+    matrix::ColMatrix, AuxTraceRandElements, ConstraintCompositionCoefficients,
+    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, TraceInfo, TracePolyTable,
+    TraceTable,
+};
 
 #[cfg(feature = "concurrent")]
 use winterfell::iterators::*;
@@ -153,8 +157,8 @@ where
 
     fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
         &self,
-        trace_info: &winterfell::TraceInfo,
-        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        trace_info: &TraceInfo,
+        main_trace: &ColMatrix<Self::BaseField>,
         domain: &StarkDomain<Self::BaseField>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         DefaultTraceLde::new(trace_info, main_trace, domain)
@@ -163,8 +167,8 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: winterfell::AuxTraceRandElements<E>,
-        composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
+        aux_rand_elements: AuxTraceRandElements<E>,
+        composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }

diff --git a/examples/src/merkle/mod.rs b/examples/src/merkle/mod.rs
@@ -18,8 +18,7 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, Digest, ElementHasher, MerkleTree},
     math::{fields::f128::BaseElement, FieldElement, StarkField},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
-    Trace, TracePolyTable, TraceTable, VerifierError,
+    ProofOptions, Prover, StarkProof, Trace, VerifierError,
 };
 
 mod air;