fix serialization of generic const array in coefficients_comm suggest…

…ed by Matthew :D
o1-labs · Oct 26, 2023 · 71fe4aa · 71fe4aa
1 parent e5b40c9
commit 71fe4aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/book/src/specs/kimchi.md b/book/src/specs/kimchi.md
@@ -1761,8 +1761,8 @@ pub struct VerifierIndex<const W: usize, G: KimchiCurve> {
     #[serde(bound = "PolyComm<G>: Serialize + DeserializeOwned")]
     pub sigma_comm: [PolyComm<G>; PERMUTS],
     /// coefficient commitment array
-    #[serde(bound = "PolyComm<G>: Serialize + DeserializeOwned")]
-    pub coefficients_comm: Vec<PolyComm<G>>,
+    #[serde_as(as = "[_; W]")]
+    pub coefficients_comm: [PolyComm<G>; W],
     /// coefficient commitment array
     #[serde(bound = "PolyComm<G>: Serialize + DeserializeOwned")]
     pub generic_comm: PolyComm<G>,

diff --git a/kimchi/src/verifier_index.rs b/kimchi/src/verifier_index.rs
@@ -75,8 +75,8 @@ pub struct VerifierIndex<const W: usize, G: KimchiCurve> {
     #[serde(bound = "PolyComm<G>: Serialize + DeserializeOwned")]
     pub sigma_comm: [PolyComm<G>; PERMUTS],
     /// coefficient commitment array
-    #[serde(bound = "PolyComm<G>: Serialize + DeserializeOwned")]
-    pub coefficients_comm: Vec<PolyComm<G>>,
+    #[serde_as(as = "[_; W]")]
+    pub coefficients_comm: [PolyComm<G>; W],
     /// coefficient commitment array
     #[serde(bound = "PolyComm<G>: Serialize + DeserializeOwned")]
     pub generic_comm: PolyComm<G>,
@@ -215,12 +215,12 @@ impl<const W: usize, G: KimchiCurve> ProverIndex<W, G> {
                     &self.column_evaluations.permutation_coefficients8[i],
                 )
             }),
-            coefficients_comm: self
-                .column_evaluations
-                .coefficients8
-                .iter()
-                .map(|c| self.srs.commit_evaluations_non_hiding(domain, c))
-                .collect::<Vec<_>>(),
+            coefficients_comm: array::from_fn(|i| {
+                self.srs.commit_evaluations_non_hiding(
+                    domain,
+                    &self.column_evaluations.coefficients8[i],
+                )
+            }),
             generic_comm: mask_fixed(
                 self.srs.commit_evaluations_non_hiding(
                     domain,