simplify new_evaluator arg

facebook · May 2, 2024 · 4a37c5e · 4a37c5e
1 parent 3d525c5
commit 4a37c5e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 31 deletions.
diff --git a/examples/src/fibonacci/fib2/prover.rs b/examples/src/fibonacci/fib2/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -84,7 +83,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/fibonacci/fib8/prover.rs b/examples/src/fibonacci/fib8/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -99,7 +98,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/fibonacci/fib_small/prover.rs b/examples/src/fibonacci/fib_small/prover.rs
@@ -8,8 +8,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -83,7 +82,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/fibonacci/mulfib2/prover.rs b/examples/src/fibonacci/mulfib2/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -80,7 +79,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/fibonacci/mulfib8/prover.rs b/examples/src/fibonacci/mulfib8/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -92,7 +91,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/lamport/aggregate/prover.rs b/examples/src/lamport/aggregate/prover.rs
@@ -10,7 +10,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, TraceInfo, TracePolyTable, TraceTable,
+    DefaultTraceLde, StarkDomain, TraceInfo, TracePolyTable, TraceTable,
 };
 
 #[cfg(feature = "concurrent")]
@@ -125,7 +125,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/lamport/threshold/prover.rs b/examples/src/lamport/threshold/prover.rs
@@ -11,7 +11,7 @@ use super::{
 use std::collections::HashMap;
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, TraceInfo, TracePolyTable, TraceTable,
+    DefaultTraceLde, StarkDomain, TraceInfo, TracePolyTable, TraceTable,
 };
 
 #[cfg(feature = "concurrent")]
@@ -166,7 +166,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/merkle/prover.rs b/examples/src/merkle/prover.rs
@@ -10,8 +10,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // MERKLE PROVER
@@ -135,7 +134,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/rescue/prover.rs b/examples/src/rescue/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // RESCUE PROVER
@@ -102,7 +101,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/vdf/exempt/prover.rs b/examples/src/vdf/exempt/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // VDF PROVER
@@ -85,7 +84,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)

diff --git a/examples/src/vdf/regular/prover.rs b/examples/src/vdf/regular/prover.rs
@@ -9,8 +9,7 @@ use super::{
 };
 use winterfell::{
     matrix::ColMatrix, ConstraintCompositionCoefficients, DefaultConstraintEvaluator,
-    DefaultTraceLde, ProverAuxRandElements, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
+    DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable, TraceTable,
 };
 
 // VDF PROVER
@@ -80,7 +79,7 @@ where
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
-        aux_rand_elements: Option<ProverAuxRandElements<Self, E>>,
+        aux_rand_elements: Option<()>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)