From 152e7cd6033cb92f164fe1b110342dc5845f3e4e Mon Sep 17 00:00:00 2001
From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com>
Date: Wed, 16 Aug 2023 18:25:01 -0700
Subject: [PATCH] chore: minor fixes

---
 halo2-base/src/poseidon/mds.rs                     | 1 +
 halo2-base/src/poseidon/state.rs                   | 2 +-
 halo2-base/src/poseidon/{tests.rs => tests/mod.rs} | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename halo2-base/src/poseidon/{tests.rs => tests/mod.rs} (95%)

diff --git a/halo2-base/src/poseidon/mds.rs b/halo2-base/src/poseidon/mds.rs
index d4bef74b..536fd7b3 100644
--- a/halo2-base/src/poseidon/mds.rs
+++ b/halo2-base/src/poseidon/mds.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::needless_range_loop)]
 use crate::utils::ScalarField;
 
 /// The type used to hold the MDS matrix
diff --git a/halo2-base/src/poseidon/state.rs b/halo2-base/src/poseidon/state.rs
index 81cdd3a7..b533767d 100644
--- a/halo2-base/src/poseidon/state.rs
+++ b/halo2-base/src/poseidon/state.rs
@@ -124,7 +124,7 @@ impl<F: ScalarField, const T: usize, const RATE: usize> PoseidonState<F, T, RATE
             res.push(gate.mul_add(ctx, self.s[0], Constant(*e), *x));
         }
 
-        for (x, new_x) in self.s.iter_mut().zip(res.into_iter()) {
+        for (x, new_x) in self.s.iter_mut().zip(res) {
             *x = new_x
         }
     }
diff --git a/halo2-base/src/poseidon/tests.rs b/halo2-base/src/poseidon/tests/mod.rs
similarity index 95%
rename from halo2-base/src/poseidon/tests.rs
rename to halo2-base/src/poseidon/tests/mod.rs
index b15aba09..5315f8a6 100644
--- a/halo2-base/src/poseidon/tests.rs
+++ b/halo2-base/src/poseidon/tests/mod.rs
@@ -62,7 +62,7 @@ fn test_poseidon_against_test_vectors() {
             "6549537674122432311777789598043107870002137484850126429160507761192163713804",
         ];
         for (word, expected) in state_0.into_iter().zip(expected.iter()) {
-            assert_eq!(word.value.evaluate(), Fr::from_str_vartime(expected).unwrap());
+            assert_eq!(word.value(), &Fr::from_str_vartime(expected).unwrap());
         }
     }
 
@@ -90,7 +90,7 @@ fn test_poseidon_against_test_vectors() {
             "3372108894677221197912083238087960099443657816445944159266857514496320565191",
         ];
         for (word, expected) in state_0.into_iter().zip(expected.iter()) {
-            assert_eq!(word.value.evaluate(), Fr::from_str_vartime(expected).unwrap());
+            assert_eq!(word.value(), &Fr::from_str_vartime(expected).unwrap());
         }
     }
 }