lints and fmt

scroll-tech · Dec 5, 2023 · 4e98c60 · 4e98c60
1 parent 28fccb9
commit 4e98c60
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/src/constraint_builder.rs b/src/constraint_builder.rs
@@ -79,7 +79,7 @@ impl<F: FromUniformBytes<64> + Ord> ConstraintBuilder<F> {
         let mut lookup: Vec<_> = left
             .into_iter()
             .map(|q| q * condition.clone())
-            .zip(right.into_iter())
+            .zip(right)
             .collect();
         // If condition is true, every_row_selector must be enabled.
         lookup.push((condition.into(), self.every_row_selector().into()));

diff --git a/src/mpt.rs b/src/mpt.rs
@@ -258,7 +258,7 @@ impl MptCircuitConfig {
         meta: &mut VirtualCells<'_, F>,
     ) -> [Expression<F>; 8] {
         std::iter::once(Query::from(self.selector.current()))
-            .chain(self.mpt_update.lookup().into_iter())
+            .chain(self.mpt_update.lookup())
             .map(|q| q.run(meta))
             .collect::<Vec<_>>()
             .try_into()

diff --git a/src/tests.rs b/src/tests.rs
@@ -75,7 +75,7 @@ fn verifying_key_constant() {
         N_ROWS,
         vec![(
             MPTProofType::BalanceChanged,
-            serde_json::from_str(&include_str!(
+            serde_json::from_str(include_str!(
                 "traces/empty_account_type_1_balance_update.json"
             ))
             .unwrap(),
@@ -164,8 +164,8 @@ fn empty_account_type_2() {
 #[test]
 fn empty_account_proofs_for_zero_value_updates() {
     let traces: [SMTTrace; 2] = [
-        serde_json::from_str(&include_str!("traces/empty_account_type_1.json")).unwrap(),
-        serde_json::from_str(&include_str!("traces/empty_account_type_2.json")).unwrap(),
+        serde_json::from_str(include_str!("traces/empty_account_type_1.json")).unwrap(),
+        serde_json::from_str(include_str!("traces/empty_account_type_2.json")).unwrap(),
     ];
     for trace in traces {
         for proof_type in [
@@ -769,26 +769,26 @@ fn multiple_updates() {
     let witness = vec![
         (
             MPTProofType::StorageChanged,
-            serde_json::from_str(&include_str!("traces/empty_storage_type_1_update_c.json"))
+            serde_json::from_str(include_str!("traces/empty_storage_type_1_update_c.json"))
                 .unwrap(),
         ),
         (
             MPTProofType::CodeHashExists,
-            serde_json::from_str(&include_str!(
+            serde_json::from_str(include_str!(
                 "traces/existing_account_keccak_codehash_update.json"
             ))
             .unwrap(),
         ),
         (
             MPTProofType::BalanceChanged,
-            serde_json::from_str(&include_str!(
+            serde_json::from_str(include_str!(
                 "traces/empty_account_type_2_balance_update.json"
             ))
             .unwrap(),
         ),
         (
             MPTProofType::AccountDoesNotExist,
-            serde_json::from_str(&include_str!("traces/empty_account_type_1.json")).unwrap(),
+            serde_json::from_str(include_str!("traces/empty_account_type_1.json")).unwrap(),
         ),
     ];
     mock_prove(witness);
@@ -853,7 +853,7 @@ fn depth_1_type_1_storage() {
     // because of an insertion or deletion.
 
     let trace: SMTTrace =
-        serde_json::from_str(&include_str!("traces/depth_1_type_1_storage.json")).unwrap();
+        serde_json::from_str(include_str!("traces/depth_1_type_1_storage.json")).unwrap();
     mock_prove(vec![(MPTProofType::StorageChanged, trace.clone())]);
     mock_prove(vec![(MPTProofType::StorageChanged, reverse(trace))]);
 }
@@ -1020,7 +1020,7 @@ fn create_name_registrator_per_txs_not_enough_gas_d0_g0_v0() {
     // These mpt updates are by the test case at
     // https://github.com/ethereum/tests/blob/747a4828f36c5fc8ab4f288d1cf4f1fe6662f3d6/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
     mock_prove(
-        serde_json::from_str(&include_str!(
+        serde_json::from_str(include_str!(
             "traces/createNameRegistratorPerTxsNotEnoughGas_d0_g0_v0.json"
         ))
         .unwrap(),
@@ -1062,7 +1062,7 @@ fn test_n_rows_required() {
 #[test]
 fn verify_benchmark_trace() {
     let witness: Vec<(MPTProofType, SMTTrace)> =
-        serde_json::from_str(&include_str!("../benches/traces.json")).unwrap();
+        serde_json::from_str(include_str!("../benches/traces.json")).unwrap();
     let proofs: Vec<_> = witness.clone().into_iter().map(Proof::from).collect();
 
     let n_rows_required = MptCircuitConfig::n_rows_required(&proofs);

diff --git a/src/types.rs b/src/types.rs
@@ -825,12 +825,12 @@ impl Proof {
 
         assert_eq!(
             self.old_account_hash_traces[5][2],
-            self.address_hash_traces.get(0).unwrap().2
+            self.address_hash_traces.first().unwrap().2
         );
 
         assert_eq!(
             self.new_account_hash_traces[5][2],
-            self.address_hash_traces.get(0).unwrap().3
+            self.address_hash_traces.first().unwrap().3
         );
         if let Some(old_leaf) = self.leafs[0] {
             assert_eq!(

diff --git a/src/types/trie.rs b/src/types/trie.rs
@@ -255,18 +255,18 @@ impl TrieRows {
                     );
                 }
                 PathType::ExtensionOld => {
-                    self.0
-                        .get(i + 1)
-                        .map(|row| assert_eq!(row.path_type, PathType::ExtensionOld));
+                    if let Some(row) = self.0.get(i + 1) {
+                        assert_eq!(row.path_type, PathType::ExtensionOld);
+                    }
                     assert_eq!(
                         domain_hash(old_left, old_right, row.domain),
                         expected_old_hash
                     );
                 }
                 PathType::ExtensionNew => {
-                    self.0
-                        .get(i + 1)
-                        .map(|row| assert_eq!(row.path_type, PathType::ExtensionNew));
+                    if let Some(row) = self.0.get(i + 1) {
+                        assert_eq!(row.path_type, PathType::ExtensionNew);
+                    }
                     assert_eq!(
                         domain_hash(new_left, new_right, row.domain),
                         expected_new_hash