clippy

Author: TomWambsgans

crates/poseidon_circuit/src/gkr_layers/compression.rs

@@ -1,4 +1,3 @@
-
 use multilinear_toolkit::prelude::*;
 use p3_field::ExtensionField;
 
@@ -33,8 +32,7 @@ where
     }
 }
 
-impl<const WIDTH: usize> SumcheckComputationPacked<EF> for CompressionComputation<WIDTH>
-{
+impl<const WIDTH: usize> SumcheckComputationPacked<EF> for CompressionComputation<WIDTH> {
     fn degree(&self) -> usize {
         2
     }

crates/poseidon_circuit/src/prove.rs

@@ -2,7 +2,7 @@ use crate::{
     CompressionComputation, EF, F, FullRoundComputation, PartialRoundComputation, PoseidonWitness,
     gkr_layers::{BatchPartialRounds, PoseidonGKRLayers},
 };
-use crate::{GKRPoseidonResult, build_poseidon_matrices};
+use crate::{GKRPoseidonResult, build_poseidon_inv_matrices};
 use multilinear_toolkit::prelude::*;
 use p3_koala_bear::{KoalaBearInternalLayerParameters, KoalaBearParameters};
 use p3_monty_31::InternalLayerBaseParameters;
@@ -20,8 +20,7 @@ where
     KoalaBearInternalLayerParameters: InternalLayerBaseParameters<KoalaBearParameters, WIDTH>,
 {
     let selectors = univariate_selectors::<F>(univariate_skips);
-    let (_mds_matrix, inv_mds_matrix, _light_matrix, inv_light_matrix) =
-        build_poseidon_matrices::<WIDTH>();
+    let (inv_mds_matrix, inv_light_matrix) = build_poseidon_inv_matrices::<WIDTH>();
 
     assert_eq!(point.len(), log2_strict_usize(witness.n_poseidons()));
 

crates/poseidon_circuit/src/utils.rs

@@ -11,30 +11,26 @@ use tracing::instrument;
 use crate::F;
 
 #[instrument(skip_all)]
-pub fn build_poseidon_matrices<const WIDTH: usize>() -> (
-    [[F; WIDTH]; WIDTH],
-    [[F; WIDTH]; WIDTH],
-    [[F; WIDTH]; WIDTH],
-    [[F; WIDTH]; WIDTH],
-)
+pub fn build_poseidon_inv_matrices<const WIDTH: usize>()
+-> ([[F; WIDTH]; WIDTH], [[F; WIDTH]; WIDTH])
 where
     KoalaBearInternalLayerParameters: InternalLayerBaseParameters<KoalaBearParameters, WIDTH>,
 {
     let mut mds_matrix: [[F; WIDTH]; WIDTH] = array::from_fn(|_| array::from_fn(|_| F::ZERO));
-    for i in 0..WIDTH {
-        mds_matrix[i][i] = F::ONE;
-        GenericPoseidon2LinearLayersKoalaBear::external_linear_layer(&mut mds_matrix[i]);
+    for (i, row) in mds_matrix.iter_mut().enumerate() {
+        row[i] = F::ONE;
+        GenericPoseidon2LinearLayersKoalaBear::internal_linear_layer(row);
     }
     mds_matrix = transpose_matrix(&mds_matrix);
     let inv_mds_matrix = inverse_matrix(&mds_matrix);
 
     let mut light_matrix: [[F; WIDTH]; WIDTH] = array::from_fn(|_| array::from_fn(|_| F::ZERO));
-    for i in 0..WIDTH {
-        light_matrix[i][i] = F::ONE;
-        GenericPoseidon2LinearLayersKoalaBear::internal_linear_layer(&mut light_matrix[i]);
+    for (i, row) in light_matrix.iter_mut().enumerate() {
+        row[i] = F::ONE;
+        GenericPoseidon2LinearLayersKoalaBear::internal_linear_layer(row);
     }
     light_matrix = transpose_matrix(&light_matrix);
     let inv_light_matrix = inverse_matrix(&light_matrix);
 
-    (mds_matrix, inv_mds_matrix, light_matrix, inv_light_matrix)
+    (inv_mds_matrix, inv_light_matrix)
 }

crates/poseidon_circuit/src/verify.rs

@@ -4,7 +4,7 @@ use p3_monty_31::InternalLayerBaseParameters;
 
 use crate::{
     CompressionComputation, EF, F, FullRoundComputation, GKRPoseidonResult,
-    PartialRoundComputation, build_poseidon_matrices, gkr_layers::PoseidonGKRLayers,
+    PartialRoundComputation, build_poseidon_inv_matrices, gkr_layers::PoseidonGKRLayers,
 };
 
 pub fn verify_poseidon_gkr<const WIDTH: usize, const N_COMMITED_CUBES: usize>(
@@ -19,8 +19,7 @@ where
     KoalaBearInternalLayerParameters: InternalLayerBaseParameters<KoalaBearParameters, WIDTH>,
 {
     let selectors = univariate_selectors::<F>(univariate_skips);
-    let (_mds_matrix, inv_mds_matrix, _light_matrix, inv_light_matrix) =
-        build_poseidon_matrices::<WIDTH>();
+    let (inv_mds_matrix, inv_light_matrix) = build_poseidon_inv_matrices::<WIDTH>();
 
     let mut output_claims = vec![];
     let mut claims = vec![];

crates/poseidon_circuit/src/witness_gen.rs

@@ -61,7 +61,7 @@ where
         (None, layer, vec![].try_into().unwrap())
     } else {
         let (next_layer, committed_cubes) =
-            apply_batch_partial_rounds(&layer, &layers.batch_partial_rounds.as_ref().unwrap());
+            apply_batch_partial_rounds(&layer, layers.batch_partial_rounds.as_ref().unwrap());
         (Some(layer), next_layer, committed_cubes)
     };
 
@@ -146,8 +146,8 @@ where
         .for_each(|(row_index, output_row)| {
             let mut buff: [A; WIDTH] = array::from_fn(|j| input_layers[j][row_index]);
             if CUBE {
-                for j in 0..WIDTH {
-                    buff[j] = buff[j].cube();
+                for v in &mut buff {
+                    *v = v.cube();
                 }
             }
             if MDS {