adds PublicVar type to AirBuilderWithPublicValues trait

valida-xyz · May 15, 2024 · b499aec · b499aec
1 parent dbbacf2
commit b499aec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/air/src/air.rs b/air/src/air.rs
@@ -109,7 +109,9 @@ pub trait AirBuilder: Sized {
 }
 
 pub trait AirBuilderWithPublicValues: AirBuilder {
-    fn public_values(&self) -> &[Self::F];
+    type PublicVar: Into<Self::Expr> + Copy;
+
+    fn public_values(&self) -> &[Self::PublicVar];
 }
 
 pub trait PairBuilder: AirBuilder {

diff --git a/uni-stark/src/check_constraints.rs b/uni-stark/src/check_constraints.rs
@@ -98,7 +98,9 @@ where
 }
 
 impl<'a, F: Field> AirBuilderWithPublicValues for DebugConstraintBuilder<'a, F> {
-    fn public_values(&self) -> &[Self::F] {
+    type PublicVar = F;
+
+    fn public_values(&self) -> &[Self::PublicVar] {
         self.public_values
     }
 }
diff --git a/uni-stark/src/folder.rs b/uni-stark/src/folder.rs
@@ -58,6 +58,8 @@ impl<'a, SC: StarkGenericConfig> AirBuilder for ProverConstraintFolder<'a, SC> {
 }
 
 impl<'a, SC: StarkGenericConfig> AirBuilderWithPublicValues for ProverConstraintFolder<'a, SC> {
+    type PublicVar = Self::F;
+
     fn public_values(&self) -> &[Self::F] {
         self.public_values
     }
@@ -96,6 +98,8 @@ impl<'a, SC: StarkGenericConfig> AirBuilder for VerifierConstraintFolder<'a, SC>
     }
 }
 impl<'a, SC: StarkGenericConfig> AirBuilderWithPublicValues for VerifierConstraintFolder<'a, SC> {
+    type PublicVar = Self::F;
+
     fn public_values(&self) -> &[Self::F] {
         self.public_values
     }

diff --git a/uni-stark/src/symbolic_builder.rs b/uni-stark/src/symbolic_builder.rs
@@ -117,7 +117,9 @@ impl<F: Field> AirBuilder for SymbolicAirBuilder<F> {
 }
 
 impl<F: Field> AirBuilderWithPublicValues for SymbolicAirBuilder<F> {
-    fn public_values(&self) -> &[Self::F] {
+    type PublicVar = F;
+
+    fn public_values(&self) -> &[Self::PublicVar] {
         self.public_values.as_slice()
     }
 }