From 2e16460e2b1a4f510d46d6af783c3e09c621ebae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20=C5=9Awirski?= Date: Sat, 23 Nov 2024 20:50:01 +0100 Subject: [PATCH] cargo fmt --- prover/benches/lagrange_kernel.rs | 4 +++- prover/src/constraints/commitment/default.rs | 18 +++++++++--------- prover/src/constraints/commitment/mod.rs | 1 - prover/src/lib.rs | 3 +-- winterfell/src/tests.rs | 5 ++++- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/prover/benches/lagrange_kernel.rs b/prover/benches/lagrange_kernel.rs index 0db91d6ab..92bf54f5a 100644 --- a/prover/benches/lagrange_kernel.rs +++ b/prover/benches/lagrange_kernel.rs @@ -14,7 +14,9 @@ use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criteri use crypto::{hashers::Blake3_256, DefaultRandomCoin, MerkleTree, RandomCoin}; use math::{fields::f64::BaseElement, ExtensionOf, FieldElement}; use winter_prover::{ - matrix::ColMatrix, CompositionPoly, CompositionPolyTrace, DefaultConstraintCommitment, DefaultConstraintEvaluator, DefaultTraceLde, Prover, ProverGkrProof, StarkDomain, Trace, TracePolyTable + matrix::ColMatrix, CompositionPoly, CompositionPolyTrace, DefaultConstraintCommitment, + DefaultConstraintEvaluator, DefaultTraceLde, Prover, ProverGkrProof, StarkDomain, Trace, + TracePolyTable, }; const TRACE_LENS: [usize; 2] = [2_usize.pow(16), 2_usize.pow(20)]; diff --git a/prover/src/constraints/commitment/default.rs b/prover/src/constraints/commitment/default.rs index 7a147e84f..cadea229f 100644 --- a/prover/src/constraints/commitment/default.rs +++ b/prover/src/constraints/commitment/default.rs @@ -4,8 +4,8 @@ // LICENSE file in the root directory of this source tree. use alloc::vec::Vec; -use tracing::info_span; use core::marker::PhantomData; +use tracing::info_span; use air::{proof::Queries, PartitionOptions}; use crypto::{ElementHasher, VectorCommitment}; @@ -48,11 +48,14 @@ where domain: &StarkDomain, partition_options: PartitionOptions, ) -> (Self, CompositionPoly) { - // extend the main execution trace and build a commitment to the extended trace - let (evaluations, commitment, composition_poly) = - build_constraint_commitment::(composition_poly_trace, num_constraint_composition_columns, domain, partition_options); - + let (evaluations, commitment, composition_poly) = build_constraint_commitment::( + composition_poly_trace, + num_constraint_composition_columns, + domain, + partition_options, + ); + assert_eq!( evaluations.num_rows(), commitment.domain_len(), @@ -142,10 +145,7 @@ where "compute_constraint_evaluation_commitment", log_domain_size = domain_size.ilog2() ) - .in_scope(|| { - composed_evaluations - .commit_to_rows::(partition_options) - }); + .in_scope(|| composed_evaluations.commit_to_rows::(partition_options)); (composed_evaluations, commitment, composition_poly) } diff --git a/prover/src/constraints/commitment/mod.rs b/prover/src/constraints/commitment/mod.rs index d3fe5513a..5ecfe8b08 100644 --- a/prover/src/constraints/commitment/mod.rs +++ b/prover/src/constraints/commitment/mod.rs @@ -12,7 +12,6 @@ use super::RowMatrix; mod default; pub use default::DefaultConstraintCommitment; - // CONSTRAINT COMMITMENT // ================================================================================================ diff --git a/prover/src/lib.rs b/prover/src/lib.rs index fc4d2cbbf..38c77c5e4 100644 --- a/prover/src/lib.rs +++ b/prover/src/lib.rs @@ -71,7 +71,7 @@ use matrix::{ColMatrix, RowMatrix}; mod constraints; pub use constraints::{ CompositionPoly, CompositionPolyTrace, ConstraintCommitment, ConstraintEvaluator, - DefaultConstraintEvaluator, DefaultConstraintCommitment, + DefaultConstraintCommitment, DefaultConstraintEvaluator, }; mod composer; @@ -153,7 +153,6 @@ pub trait Prover { where E: FieldElement; - /// Constraints evaluator used to evaluate AIR constraints over the extended execution trace. type ConstraintEvaluator<'a, E>: ConstraintEvaluator where diff --git a/winterfell/src/tests.rs b/winterfell/src/tests.rs index 6bcb1afe5..c1ae685e9 100644 --- a/winterfell/src/tests.rs +++ b/winterfell/src/tests.rs @@ -8,7 +8,10 @@ use std::{vec, vec::Vec}; use air::{GkrRandElements, LagrangeKernelRandElements}; use crypto::MerkleTree; use prover::{ - crypto::{hashers::Blake3_256, DefaultRandomCoin, RandomCoin}, math::{fields::f64::BaseElement, ExtensionOf, FieldElement}, matrix::ColMatrix, CompositionPoly, DefaultConstraintCommitment + crypto::{hashers::Blake3_256, DefaultRandomCoin, RandomCoin}, + math::{fields::f64::BaseElement, ExtensionOf, FieldElement}, + matrix::ColMatrix, + CompositionPoly, DefaultConstraintCommitment, }; use super::*;