refactor!: rename ProverEvaluate::prover_evaluate to `final_round_e…

…valuate`
spaceandtimelabs · Oct 11, 2024 · 42f3069 · 42f3069
1 parent 8e69f9d
commit 42f3069
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/crates/proof-of-sql/src/sql/proof/proof_plan.rs b/crates/proof-of-sql/src/sql/proof/proof_plan.rs
@@ -66,7 +66,7 @@ pub trait ProverEvaluate<S: Scalar> {
     /// Intermediate values that are needed to form the proof are allocated into the arena
     /// allocator alloc. These intermediate values will persist through proof creation and
     /// will be bulk deallocated once the proof is formed.
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, S>,
         alloc: &'a Bump,

diff --git a/crates/proof-of-sql/src/sql/proof/query_proof.rs b/crates/proof-of-sql/src/sql/proof/query_proof.rs
@@ -79,7 +79,7 @@ impl<CP: CommitmentEvaluationProof> QueryProof<CP> {
 
         let mut builder =
             FinalRoundBuilder::new(table_length, num_sumcheck_variables, post_result_challenges);
-        expr.prover_evaluate(&mut builder, &alloc, accessor);
+        expr.final_round_evaluate(&mut builder, &alloc, accessor);
 
         let num_sumcheck_variables = builder.num_sumcheck_variables();
         let table_length = builder.table_length();

diff --git a/crates/proof-of-sql/src/sql/proof/query_proof_test.rs b/crates/proof-of-sql/src/sql/proof/query_proof_test.rs
@@ -53,7 +53,7 @@ impl<S: Scalar> ProverEvaluate<S> for TrivialTestProofPlan {
 
     fn first_round_evaluate(&self, _builder: &mut FirstRoundBuilder) {}
 
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, S>,
         alloc: &'a Bump,
@@ -210,7 +210,7 @@ impl<S: Scalar> ProverEvaluate<S> for SquareTestProofPlan {
 
     fn first_round_evaluate(&self, _builder: &mut FirstRoundBuilder) {}
 
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, S>,
         alloc: &'a Bump,
@@ -392,7 +392,7 @@ impl<S: Scalar> ProverEvaluate<S> for DoubleSquareTestProofPlan {
 
     fn first_round_evaluate(&self, _builder: &mut FirstRoundBuilder) {}
 
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, S>,
         alloc: &'a Bump,
@@ -605,7 +605,7 @@ impl<S: Scalar> ProverEvaluate<S> for ChallengeTestProofPlan {
         builder.request_post_result_challenges(2);
     }
 
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, S>,
         alloc: &'a Bump,

diff --git a/crates/proof-of-sql/src/sql/proof/verifiable_query_result_test.rs b/crates/proof-of-sql/src/sql/proof/verifiable_query_result_test.rs
@@ -36,7 +36,7 @@ impl<S: Scalar> ProverEvaluate<S> for EmptyTestQueryExpr {
         vec![Column::BigInt(res); self.columns]
     }
     fn first_round_evaluate(&self, _builder: &mut FirstRoundBuilder) {}
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, S>,
         alloc: &'a Bump,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/dyn_proof_plan.rs b/crates/proof-of-sql/src/sql/proof_plans/dyn_proof_plan.rs
@@ -114,17 +114,17 @@ impl<C: Commitment> ProverEvaluate<C::Scalar> for DynProofPlan<C> {
         }
     }
 
-    #[tracing::instrument(name = "DynProofPlan::prover_evaluate", level = "debug", skip_all)]
-    fn prover_evaluate<'a>(
+    #[tracing::instrument(name = "DynProofPlan::final_round_evaluate", level = "debug", skip_all)]
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut crate::sql::proof::FinalRoundBuilder<'a, C::Scalar>,
         alloc: &'a bumpalo::Bump,
         accessor: &'a dyn crate::base::database::DataAccessor<C::Scalar>,
     ) -> Vec<Column<'a, C::Scalar>> {
         match self {
-            DynProofPlan::Projection(expr) => expr.prover_evaluate(builder, alloc, accessor),
-            DynProofPlan::GroupBy(expr) => expr.prover_evaluate(builder, alloc, accessor),
-            DynProofPlan::Filter(expr) => expr.prover_evaluate(builder, alloc, accessor),
+            DynProofPlan::Projection(expr) => expr.final_round_evaluate(builder, alloc, accessor),
+            DynProofPlan::GroupBy(expr) => expr.final_round_evaluate(builder, alloc, accessor),
+            DynProofPlan::Filter(expr) => expr.final_round_evaluate(builder, alloc, accessor),
         }
     }
 }
diff --git a/crates/proof-of-sql/src/sql/proof_plans/filter_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/filter_exec.rs
@@ -180,9 +180,9 @@ impl<C: Commitment> ProverEvaluate<C::Scalar> for FilterExec<C> {
         builder.request_post_result_challenges(2);
     }
 
-    #[tracing::instrument(name = "FilterExec::prover_evaluate", level = "debug", skip_all)]
+    #[tracing::instrument(name = "FilterExec::final_round_evaluate", level = "debug", skip_all)]
     #[allow(unused_variables)]
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, C::Scalar>,
         alloc: &'a Bump,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/filter_exec_test_dishonest_prover.rs b/crates/proof-of-sql/src/sql/proof_plans/filter_exec_test_dishonest_prover.rs
@@ -69,12 +69,12 @@ impl ProverEvaluate<Curve25519Scalar> for DishonestFilterExec<RistrettoPoint> {
     }
 
     #[tracing::instrument(
-        name = "DishonestFilterExec::prover_evaluate",
+        name = "DishonestFilterExec::final_round_evaluate",
         level = "debug",
         skip_all
     )]
     #[allow(unused_variables)]
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, Curve25519Scalar>,
         alloc: &'a Bump,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/group_by_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/group_by_exec.rs
@@ -256,9 +256,9 @@ impl<C: Commitment> ProverEvaluate<C::Scalar> for GroupByExec<C> {
         builder.request_post_result_challenges(2);
     }
 
-    #[tracing::instrument(name = "GroupByExec::prover_evaluate", level = "debug", skip_all)]
+    #[tracing::instrument(name = "GroupByExec::final_round_evaluate", level = "debug", skip_all)]
     #[allow(unused_variables)]
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, C::Scalar>,
         alloc: &'a Bump,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/projection_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/projection_exec.rs
@@ -116,9 +116,13 @@ impl<C: Commitment> ProverEvaluate<C::Scalar> for ProjectionExec<C> {
 
     fn first_round_evaluate(&self, _builder: &mut FirstRoundBuilder) {}
 
-    #[tracing::instrument(name = "ProjectionExec::prover_evaluate", level = "debug", skip_all)]
+    #[tracing::instrument(
+        name = "ProjectionExec::final_round_evaluate",
+        level = "debug",
+        skip_all
+    )]
     #[allow(unused_variables)]
-    fn prover_evaluate<'a>(
+    fn final_round_evaluate<'a>(
         &self,
         builder: &mut FinalRoundBuilder<'a, C::Scalar>,
         alloc: &'a Bump,