Use an array instead of a Vec

richardpringle · richardpringle · commit 9d5d9c0bcabb · 2025-04-07T14:26:45.000-04:00
diff --git a/arrabbiata/src/poseidon_3_60_0_5_5_fp.rs b/arrabbiata/src/poseidon_3_60_0_5_5_fp.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 fn params() -> ArithmeticSpongeParams<Fp> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fp::from_str(
                     "17388788707812278340106653511601894605475912579070132834621611278702208069948",
                 )
@@ -23,7 +23,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "14793820945145615522977558374530426960607001062183458732338387735995846367929",
                 )
@@ -37,7 +37,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "16508716375116042997058036529670318392110322034848187961172707099352209518970",
                 )
diff --git a/arrabbiata/src/poseidon_3_60_0_5_5_fq.rs b/arrabbiata/src/poseidon_3_60_0_5_5_fq.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 fn params() -> ArithmeticSpongeParams<Fq> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fq::from_str(
                     "13841249378323021054377890016443265503914469864575312305567855128857444259487",
                 )
@@ -23,7 +23,7 @@ fn params() -> ArithmeticSpongeParams<Fq> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fq::from_str(
                     "23740172672243477188057832304277375136172708212574345504502655344614455663606",
                 )
@@ -37,7 +37,7 @@ fn params() -> ArithmeticSpongeParams<Fq> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fq::from_str(
                     "21257914241847355181936015256361686342208107590210872866396751638657186725269",
                 )
diff --git a/ivc/src/poseidon_8_56_5_3_2/bn254/mod.rs b/ivc/src/poseidon_8_56_5_3_2/bn254/mod.rs
@@ -50,7 +50,7 @@ use super::interpreter::PoseidonParams;
 fn params() -> ArithmeticSpongeParams<Fr> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fr::from_str(
                     "1891083243990574305685895570197511851713934835398236923905694056149924753068",
                 )
@@ -64,7 +64,7 @@ fn params() -> ArithmeticSpongeParams<Fr> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fr::from_str(
                     "27684418222856506172738658695423428482598065952308803192811766786876275297242",
                 )
@@ -78,7 +78,7 @@ fn params() -> ArithmeticSpongeParams<Fr> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fr::from_str(
                     "13569069999110563102763825881967666333546046803842950209911791358856018301650",
                 )
diff --git a/ivc/src/poseidon_params_55_0_7_3.rs b/ivc/src/poseidon_params_55_0_7_3.rs
@@ -19,7 +19,7 @@ use core::str::FromStr;
 fn params() -> ArithmeticSpongeParams<Fp> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fp::from_str(
                     "18254759465961548724473677898900554279129333700345398792534035897544813417380",
                 )
@@ -33,7 +33,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "10582678689390677133753881397356982896844997242148790399395649637165847896125",
                 )
@@ -47,7 +47,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "11085432328429990699367643357327464988188253029150852680916595311968413759302",
                 )
diff --git a/kimchi/src/circuits/expr.rs b/kimchi/src/circuits/expr.rs
@@ -68,7 +68,7 @@ pub struct Constants<F: 'static> {
     /// The endomorphism coefficient
     pub endo_coefficient: F,
     /// The MDS matrix
-    pub mds: &'static Vec<Vec<F>>,
+    pub mds: &'static Vec<[F; 3]>,
     /// The number of zero-knowledge rows
     pub zk_rows: u64,
 }
diff --git a/poseidon/src/dummy_values.rs b/poseidon/src/dummy_values.rs
@@ -11,7 +11,7 @@ use std::{fmt::Debug, str::FromStr};
 pub fn kimchi_dummy<Err: Debug, Fp: Field + FromStr<Err = Err>>() -> ArithmeticSpongeParams<Fp> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fp::from_str(
                     "12035446894107573964500871153637039653510326950134440362813193268448863222019",
                 )
@@ -25,7 +25,7 @@ pub fn kimchi_dummy<Err: Debug, Fp: Field + FromStr<Err = Err>>() -> ArithmeticS
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "4491931056866994439025447213644536587424785196363427220456343191847333476930",
                 )
@@ -39,7 +39,7 @@ pub fn kimchi_dummy<Err: Debug, Fp: Field + FromStr<Err = Err>>() -> ArithmeticS
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "10525578725509990281643336361904863911009900817790387635342941550657754064843",
                 )
diff --git a/poseidon/src/pasta/fp_kimchi.rs b/poseidon/src/pasta/fp_kimchi.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 pub fn params() -> ArithmeticSpongeParams<Fp> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fp::from_str(
                     "12035446894107573964500871153637039653510326950134440362813193268448863222019",
                 )
@@ -23,7 +23,7 @@ pub fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "4491931056866994439025447213644536587424785196363427220456343191847333476930",
                 )
@@ -37,7 +37,7 @@ pub fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "10525578725509990281643336361904863911009900817790387635342941550657754064843",
                 )
diff --git a/poseidon/src/pasta/fp_legacy.rs b/poseidon/src/pasta/fp_legacy.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 fn params() -> ArithmeticSpongeParams<Fp> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fp::from_str(
                     "5328350144166205084223774245058198666309664348635459768305312917086056785354",
                 )
@@ -23,7 +23,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "10086628405675314879458652402278736459294354590428582803795166650930540770072",
                 )
@@ -37,7 +37,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fp::from_str(
                     "3059104278162906687184746935153057867173086006783171716838577369156969739687",
                 )
diff --git a/poseidon/src/pasta/fq_kimchi.rs b/poseidon/src/pasta/fq_kimchi.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 pub fn params() -> ArithmeticSpongeParams<Fq> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fq::from_str(
                     "28115781186772277486790024060542467295096710153315236019619365740021995624782",
                 )
@@ -23,7 +23,7 @@ pub fn params() -> ArithmeticSpongeParams<Fq> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fq::from_str(
                     "8515206633865386306014865142947895502833797732365705727001733785057042819852",
                 )
@@ -37,7 +37,7 @@ pub fn params() -> ArithmeticSpongeParams<Fq> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fq::from_str(
                     "2193808570710678216879007026210418088296432071066284289131688133644970611483",
                 )
diff --git a/poseidon/src/pasta/fq_legacy.rs b/poseidon/src/pasta/fq_legacy.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 fn params() -> ArithmeticSpongeParams<Fq> {
     ArithmeticSpongeParams {
         mds: vec![
-            vec![
+            [
                 Fq::from_str(
                     "25059545165736646824438510995018528850798284624488112529736697979897721366717",
                 )
@@ -23,7 +23,7 @@ fn params() -> ArithmeticSpongeParams<Fq> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fq::from_str(
                     "24729854844697760654067608751525498327180690314591492982304918187023029914826",
                 )
@@ -37,7 +37,7 @@ fn params() -> ArithmeticSpongeParams<Fq> {
                 )
                 .unwrap(),
             ],
-            vec![
+            [
                 Fq::from_str(
                     "14318325434506839029297004068378670093722923223466359838374948921878384497878",
                 )
diff --git a/poseidon/src/poseidon.rs b/poseidon/src/poseidon.rs
@@ -51,8 +51,8 @@ pub enum SpongeState {
 pub struct ArithmeticSpongeParams<F: Field + CanonicalSerialize + CanonicalDeserialize> {
     #[serde_as(as = "Vec<Vec<o1_utils::serialization::SerdeAs>>")]
     pub round_constants: Vec<Vec<F>>,
-    #[serde_as(as = "Vec<Vec<o1_utils::serialization::SerdeAs>>")]
-    pub mds: Vec<Vec<F>>,
+    #[serde_as(as = "Vec<[o1_utils::serialization::SerdeAs; 3]>")]
+    pub mds: Vec<[F; 3]>,
 }
 
 #[derive(Clone)]

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ use std::str::FromStr;`
`9`	`9`	`fn params() -> ArithmeticSpongeParams<Fp> {`
`10`	`10`	`ArithmeticSpongeParams {`
`11`	`11`	`mds: vec![`
`12`		`- vec![`
	`12`	`+ [`
`13`	`13`	`Fp::from_str(`
`14`	`14`	`"17388788707812278340106653511601894605475912579070132834621611278702208069948",`
`15`	`15`	`)`
`@@ -23,7 +23,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {`
`23`	`23`	`)`
`24`	`24`	`.unwrap(),`
`25`	`25`	`],`
`26`		`- vec![`
	`26`	`+ [`
`27`	`27`	`Fp::from_str(`
`28`	`28`	`"14793820945145615522977558374530426960607001062183458732338387735995846367929",`
`29`	`29`	`)`
`@@ -37,7 +37,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {`
`37`	`37`	`)`
`38`	`38`	`.unwrap(),`
`39`	`39`	`],`
`40`		`- vec![`
	`40`	`+ [`
`41`	`41`	`Fp::from_str(`
`42`	`42`	`"16508716375116042997058036529670318392110322034848187961172707099352209518970",`
`43`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ use super::interpreter::PoseidonParams;`
`50`	`50`	`fn params() -> ArithmeticSpongeParams<Fr> {`
`51`	`51`	`ArithmeticSpongeParams {`
`52`	`52`	`mds: vec![`
`53`		`- vec![`
	`53`	`+ [`
`54`	`54`	`Fr::from_str(`
`55`	`55`	`"1891083243990574305685895570197511851713934835398236923905694056149924753068",`
`56`	`56`	`)`
`@@ -64,7 +64,7 @@ fn params() -> ArithmeticSpongeParams<Fr> {`
`64`	`64`	`)`
`65`	`65`	`.unwrap(),`
`66`	`66`	`],`
`67`		`- vec![`
	`67`	`+ [`
`68`	`68`	`Fr::from_str(`
`69`	`69`	`"27684418222856506172738658695423428482598065952308803192811766786876275297242",`
`70`	`70`	`)`
`@@ -78,7 +78,7 @@ fn params() -> ArithmeticSpongeParams<Fr> {`
`78`	`78`	`)`
`79`	`79`	`.unwrap(),`
`80`	`80`	`],`
`81`		`- vec![`
	`81`	`+ [`
`82`	`82`	`Fr::from_str(`
`83`	`83`	`"13569069999110563102763825881967666333546046803842950209911791358856018301650",`
`84`	`84`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ use core::str::FromStr;`
`19`	`19`	`fn params() -> ArithmeticSpongeParams<Fp> {`
`20`	`20`	`ArithmeticSpongeParams {`
`21`	`21`	`mds: vec![`
`22`		`- vec![`
	`22`	`+ [`
`23`	`23`	`Fp::from_str(`
`24`	`24`	`"18254759465961548724473677898900554279129333700345398792534035897544813417380",`
`25`	`25`	`)`
`@@ -33,7 +33,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {`
`33`	`33`	`)`
`34`	`34`	`.unwrap(),`
`35`	`35`	`],`
`36`		`- vec![`
	`36`	`+ [`
`37`	`37`	`Fp::from_str(`
`38`	`38`	`"10582678689390677133753881397356982896844997242148790399395649637165847896125",`
`39`	`39`	`)`
`@@ -47,7 +47,7 @@ fn params() -> ArithmeticSpongeParams<Fp> {`
`47`	`47`	`)`
`48`	`48`	`.unwrap(),`
`49`	`49`	`],`
`50`		`- vec![`
	`50`	`+ [`
`51`	`51`	`Fp::from_str(`
`52`	`52`	`"11085432328429990699367643357327464988188253029150852680916595311968413759302",`
`53`	`53`	`)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ pub struct Constants<F: 'static> {`
`68`	`68`	`/// The endomorphism coefficient`
`69`	`69`	`pub endo_coefficient: F,`
`70`	`70`	`/// The MDS matrix`
`71`		`- pub mds: &'static Vec<Vec<F>>,`
	`71`	`+ pub mds: &'static Vec<[F; 3]>,`
`72`	`72`	`/// The number of zero-knowledge rows`
`73`	`73`	`pub zk_rows: u64,`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ use std::{fmt::Debug, str::FromStr};`
`11`	`11`	`pub fn kimchi_dummy<Err: Debug, Fp: Field + FromStr<Err = Err>>() -> ArithmeticSpongeParams<Fp> {`
`12`	`12`	`ArithmeticSpongeParams {`
`13`	`13`	`mds: vec![`
`14`		`- vec![`
	`14`	`+ [`
`15`	`15`	`Fp::from_str(`
`16`	`16`	`"12035446894107573964500871153637039653510326950134440362813193268448863222019",`
`17`	`17`	`)`
`@@ -25,7 +25,7 @@ pub fn kimchi_dummy<Err: Debug, Fp: Field + FromStr<Err = Err>>() -> ArithmeticS`
`25`	`25`	`)`
`26`	`26`	`.unwrap(),`
`27`	`27`	`],`
`28`		`- vec![`
	`28`	`+ [`
`29`	`29`	`Fp::from_str(`
`30`	`30`	`"4491931056866994439025447213644536587424785196363427220456343191847333476930",`
`31`	`31`	`)`
`@@ -39,7 +39,7 @@ pub fn kimchi_dummy<Err: Debug, Fp: Field + FromStr<Err = Err>>() -> ArithmeticS`
`39`	`39`	`)`
`40`	`40`	`.unwrap(),`
`41`	`41`	`],`
`42`		`- vec![`
	`42`	`+ [`
`43`	`43`	`Fp::from_str(`
`44`	`44`	`"10525578725509990281643336361904863911009900817790387635342941550657754064843",`
`45`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ use std::str::FromStr;`
`9`	`9`	`pub fn params() -> ArithmeticSpongeParams<Fp> {`
`10`	`10`	`ArithmeticSpongeParams {`
`11`	`11`	`mds: vec![`
`12`		`- vec![`
	`12`	`+ [`
`13`	`13`	`Fp::from_str(`
`14`	`14`	`"12035446894107573964500871153637039653510326950134440362813193268448863222019",`
`15`	`15`	`)`
`@@ -23,7 +23,7 @@ pub fn params() -> ArithmeticSpongeParams<Fp> {`
`23`	`23`	`)`
`24`	`24`	`.unwrap(),`
`25`	`25`	`],`
`26`		`- vec![`
	`26`	`+ [`
`27`	`27`	`Fp::from_str(`
`28`	`28`	`"4491931056866994439025447213644536587424785196363427220456343191847333476930",`
`29`	`29`	`)`
`@@ -37,7 +37,7 @@ pub fn params() -> ArithmeticSpongeParams<Fp> {`
`37`	`37`	`)`
`38`	`38`	`.unwrap(),`
`39`	`39`	`],`
`40`		`- vec![`
	`40`	`+ [`
`41`	`41`	`Fp::from_str(`
`42`	`42`	`"10525578725509990281643336361904863911009900817790387635342941550657754064843",`
`43`	`43`	`)`