fix the rest of pr review

ChainSafe · Feb 2, 2024 · f67efe8 · f67efe8
1 parent 476a9b7
commit f67efe8
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 41 deletions.
diff --git a/lightclient-circuits/src/witness/multiproof.rs b/lightclient-circuits/src/witness/multiproof.rs
@@ -202,14 +202,15 @@ pub fn block_header_to_leaves(
 pub fn beacon_header_multiproof_and_helper_indices(
     header: &mut BeaconBlockHeader,
     gindices: &[usize],
-) -> (Vec<Node>, Vec<usize>) {
+) -> (Vec<Vec<u8>>, Vec<usize>) {
     let header_leaves = block_header_to_leaves(header).unwrap();
     let merkle_tree = merkle_tree(&header_leaves);
     let helper_indices = get_helper_indices(gindices);
     let proof = helper_indices
         .iter()
         .copied()
         .map(|i| merkle_tree[i])
+        .map(|n| n.as_ref().to_vec())
         .collect::<Vec<_>>();
     assert_eq!(proof.len(), helper_indices.len());
     (proof, helper_indices)

diff --git a/lightclient-circuits/src/witness/rotation.rs b/lightclient-circuits/src/witness/rotation.rs
@@ -81,10 +81,7 @@ impl<S: Spec> Default for CommitteeUpdateArgs<S> {
             sync_committee_branch,
             finalized_header,
             _spec: PhantomData,
-            finalized_header_multiproof: finalized_header_multiproof
-                .into_iter()
-                .map(|n| n.as_ref().to_vec())
-                .collect_vec(),
+            finalized_header_multiproof,
             finalized_header_helper_indices,
         }
     }

diff --git a/lightclient-circuits/src/witness/step.rs b/lightclient-circuits/src/witness/step.rs
@@ -139,15 +139,9 @@ impl<S: Spec> Default for SyncStepArgs<S> {
             execution_payload_root: execution_root,
             _spec: PhantomData,
 
-            attested_header_multiproof: attested_header_multiproof
-                .into_iter()
-                .map(|n| n.as_ref().to_vec())
-                .collect_vec(),
+            attested_header_multiproof,
             attested_header_helper_indices,
-            finalized_header_multiproof: finalized_header_multiproof
-                .into_iter()
-                .map(|n| n.as_ref().to_vec())
-                .collect_vec(),
+            finalized_header_multiproof,
             finalized_header_helper_indices,
         }
     }

diff --git a/preprocessor/src/rotation.rs b/preprocessor/src/rotation.rs
@@ -109,10 +109,7 @@ where
             .map(|n| n.to_vec())
             .collect_vec(),
         _spec: PhantomData,
-        finalized_header_multiproof: finalized_header_multiproof
-            .into_iter()
-            .map(|n| n.to_vec())
-            .collect_vec(),
+        finalized_header_multiproof,
         finalized_header_helper_indices,
     };
     Ok(args)

diff --git a/preprocessor/src/step.rs b/preprocessor/src/step.rs
@@ -167,15 +167,9 @@ pub async fn step_args_from_finality_update<S: Spec>(
             .collect_vec(),
         domain,
         _spec: PhantomData,
-        attested_header_multiproof: attested_header_multiproof
-            .into_iter()
-            .map(|n| n.as_ref().to_vec())
-            .collect_vec(),
+        attested_header_multiproof,
         attested_header_helper_indices,
-        finalized_header_multiproof: finalized_header_multiproof
-            .into_iter()
-            .map(|n| n.as_ref().to_vec())
-            .collect_vec(),
+        finalized_header_multiproof,
         finalized_header_helper_indices,
     })
 }

diff --git a/preprocessor/src/unit_test_gen.rs b/preprocessor/src/unit_test_gen.rs
@@ -205,10 +205,7 @@ fn main() {
             .map(|n| n.as_ref().to_vec())
             .collect_vec(),
         attested_header_helper_indices,
-        finalized_header_multiproof: finalized_header_multiproof
-            .into_iter()
-            .map(|n| n.as_ref().to_vec())
-            .collect_vec(),
+        finalized_header_multiproof,
         finalized_header_helper_indices,
     };
 
@@ -226,10 +223,7 @@ fn main() {
             .map(|x| x.to_vec())
             .collect_vec(),
         _spec: std::marker::PhantomData,
-        finalized_header_multiproof: attested_header_multiproof
-            .into_iter()
-            .map(|n| n.as_ref().to_vec())
-            .collect_vec(),
+        finalized_header_multiproof,
         finalized_header_helper_indices: attested_header_helper_indices,
     };
 

diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
@@ -269,15 +269,9 @@ fn to_sync_ciruit_witness<const SYNC_COMMITTEE_SIZE: usize>(
             &[Minimal::HEADER_SLOT_INDEX, Minimal::HEADER_BODY_ROOT_INDEX],
         );
 
-    args.finalized_header_multiproof = finalized_header_multiproof
-        .into_iter()
-        .map(|n| n.to_vec())
-        .collect_vec();
+    args.finalized_header_multiproof = finalized_header_multiproof;
     args.finalized_header_helper_indices = finalized_header_helper_indices;
-    args.attested_header_multiproof = attested_header_multiproof
-        .into_iter()
-        .map(|n| n.to_vec())
-        .collect_vec();
+    args.attested_header_multiproof = attested_header_multiproof;
     args.attested_header_helper_indices = attested_header_helper_indices;
 
     args