refactor!: remove accessor from ProofPlan::count

That's because the arg is never used
spaceandtimelabs · Nov 7, 2024 · b2e059e · b2e059e
1 parent ca82b96
commit b2e059e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 51 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
@@ -17,11 +17,7 @@ use core::fmt::Debug;
 #[enum_dispatch::enum_dispatch(DynProofPlan)]
 pub trait ProofPlan: Debug + Send + Sync + ProverEvaluate {
     /// Count terms used within the Query's proof
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError>;
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError>;
 
     /// The length of the input table
     fn get_length(&self, accessor: &dyn MetadataAccessor) -> usize;

diff --git a/crates/proof-of-sql/src/sql/proof/query_proof.rs b/crates/proof-of-sql/src/sql/proof/query_proof.rs
@@ -168,7 +168,7 @@ impl<CP: CommitmentEvaluationProof> QueryProof<CP> {
         // count terms
         let counts = {
             let mut builder = CountBuilder::new(&self.bit_distributions);
-            expr.count(&mut builder, accessor)?;
+            expr.count(&mut builder)?;
             builder.counts()
         }?;
 

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
@@ -69,11 +69,7 @@ impl ProverEvaluate for TrivialTestProofPlan {
     }
 }
 impl ProofPlan for TrivialTestProofPlan {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         builder.count_degree(2);
         builder.count_intermediate_mles(1);
         builder.count_subpolynomials(1);
@@ -238,11 +234,7 @@ impl ProverEvaluate for SquareTestProofPlan {
     }
 }
 impl ProofPlan for SquareTestProofPlan {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         builder.count_degree(3);
         builder.count_intermediate_mles(1);
         builder.count_subpolynomials(1);
@@ -436,11 +428,7 @@ impl ProverEvaluate for DoubleSquareTestProofPlan {
     }
 }
 impl ProofPlan for DoubleSquareTestProofPlan {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         builder.count_degree(3);
         builder.count_intermediate_mles(2);
         builder.count_subpolynomials(2);
@@ -641,11 +629,7 @@ impl ProverEvaluate for ChallengeTestProofPlan {
     }
 }
 impl ProofPlan for ChallengeTestProofPlan {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         builder.count_degree(3);
         builder.count_intermediate_mles(1);
         builder.count_subpolynomials(1);

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
@@ -51,11 +51,7 @@ impl ProverEvaluate for EmptyTestQueryExpr {
     }
 }
 impl ProofPlan for EmptyTestQueryExpr {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         builder.count_intermediate_mles(self.columns);
         Ok(())
     }

diff --git a/crates/proof-of-sql/src/sql/proof_plans/empty_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/empty_exec.rs
@@ -38,11 +38,7 @@ impl EmptyExec {
 }
 
 impl ProofPlan for EmptyExec {
-    fn count(
-        &self,
-        _builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, _builder: &mut CountBuilder) -> Result<(), ProofError> {
         Ok(())
     }
 

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
@@ -60,11 +60,7 @@ impl<H: ProverHonestyMarker> ProofPlan for OstensibleFilterExec<H>
 where
     OstensibleFilterExec<H>: ProverEvaluate,
 {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         self.where_clause.count(builder)?;
         for aliased_expr in &self.aliased_results {
             aliased_expr.expr.count(builder)?;

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
@@ -69,11 +69,7 @@ impl GroupByExec {
 }
 
 impl ProofPlan for GroupByExec {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         self.where_clause.count(builder)?;
         for expr in &self.group_by_exprs {
             expr.count(builder)?;

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
@@ -43,11 +43,7 @@ impl ProjectionExec {
 }
 
 impl ProofPlan for ProjectionExec {
-    fn count(
-        &self,
-        builder: &mut CountBuilder,
-        _accessor: &dyn MetadataAccessor,
-    ) -> Result<(), ProofError> {
+    fn count(&self, builder: &mut CountBuilder) -> Result<(), ProofError> {
         for aliased_expr in &self.aliased_results {
             aliased_expr.expr.count(builder)?;
             builder.count_intermediate_mles(1);