From 4a37c5e3ed0b578b4502a27cfaf4dc82bb03440d Mon Sep 17 00:00:00 2001 From: Philippe Laferriere Date: Thu, 2 May 2024 04:49:38 -0400 Subject: [PATCH] simplify `new_evaluator` arg --- examples/src/fibonacci/fib2/prover.rs | 5 ++--- examples/src/fibonacci/fib8/prover.rs | 5 ++--- examples/src/fibonacci/fib_small/prover.rs | 5 ++--- examples/src/fibonacci/mulfib2/prover.rs | 5 ++--- examples/src/fibonacci/mulfib8/prover.rs | 5 ++--- examples/src/lamport/aggregate/prover.rs | 4 ++-- examples/src/lamport/threshold/prover.rs | 4 ++-- examples/src/merkle/prover.rs | 5 ++--- examples/src/rescue/prover.rs | 5 ++--- examples/src/vdf/exempt/prover.rs | 5 ++--- examples/src/vdf/regular/prover.rs | 5 ++--- 11 files changed, 22 insertions(+), 31 deletions(-) diff --git a/examples/src/fibonacci/fib2/prover.rs b/examples/src/fibonacci/fib2/prover.rs index 605e52cef..edbd41e31 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 90c0ea210..1de335b75 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index c744ddafa..fbb9d5f00 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 86ff659d7..63ea88267 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 2b160f2ed..f7da087cf 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 2a2c9c0d2..cfc5cc9c2 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index e653c3708..6634185c1 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 259d8ca1d..87f362bc9 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 1d81164c7..f08fa0f4e 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index 7315979a2..ce1910f24 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> 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 index a6458cb61..60cf3d7e0 100644 --- 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>( &self, air: &'a Self::Air, - aux_rand_elements: Option>, + aux_rand_elements: Option<()>, composition_coefficients: ConstraintCompositionCoefficients, ) -> Self::ConstraintEvaluator<'a, E> { DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)