chore: fix pr comments

Author: prkpndy

orchestrator/crates/settlement-clients/ethereum/src/conversion.rs

@@ -122,21 +122,14 @@ pub(crate) fn prepare_sidecar_with_proof(
     state_diff: &[Vec<u8>],
     trusted_setup: &KzgSettings,
 ) -> EyreResult<BlobTransactionSidecarVariant> {
-    let mut sidecar_blobs = vec![];
-    let mut sidecar_commitments = vec![];
+    // Prepare Blobs and Commitments from State Diff
+    let (sidecar_blobs, sidecar_commitments) = get_blobs_and_commitments(state_diff, trusted_setup)?;
     let mut sidecar_proofs = vec![];
 
-    for blob_data in state_diff {
+    for (blob_data, commitment) in state_diff.iter().zip(&sidecar_commitments) {
         let fixed_size_blob: [u8; BYTES_PER_BLOB] = blob_data.as_slice().try_into()?;
-
         let blob = Blob::new(fixed_size_blob);
-
-        let commitment = trusted_setup.blob_to_kzg_commitment(&blob)?;
-
         let proof = trusted_setup.compute_blob_kzg_proof(&blob, &commitment.to_bytes())?;
-
-        sidecar_blobs.push(FixedBytes::new(fixed_size_blob));
-        sidecar_commitments.push(FixedBytes::new(commitment.to_bytes().into_inner()));
         sidecar_proofs.push(FixedBytes::new(proof.to_bytes().into_inner()));
     }
 
@@ -148,25 +141,18 @@ pub(crate) fn prepare_sidecar_with_proof(
 }
 
 // Function to prepare sidecar for EIP 7594 transaction
-#[allow(clippy::type_complexity)]
 pub fn prepare_sidecar_with_cells(
     state_diff: &[Vec<u8>],
     trusted_setup: &KzgSettings,
 ) -> EyreResult<BlobTransactionSidecarVariant> {
-    let mut sidecar_blobs = vec![];
-    let mut sidecar_commitments = vec![];
+    // Prepare Blobs and Commitments from State Diff
+    let (sidecar_blobs, sidecar_commitments) = get_blobs_and_commitments(state_diff, trusted_setup)?;
     let mut all_cell_proofs = vec![]; // Vec of Vec because each blob has CELLS_PER_EXT_BLOB proofs
 
     for blob_data in state_diff {
         let fixed_size_blob: [u8; BYTES_PER_BLOB] = blob_data.as_slice().try_into()?;
-
         let blob = Blob::new(fixed_size_blob);
 
-        let commitment = trusted_setup.blob_to_kzg_commitment(&blob)?;
-
-        sidecar_blobs.push(FixedBytes::new(fixed_size_blob));
-        sidecar_commitments.push(FixedBytes::new(commitment.to_bytes().into_inner()));
-
         // Compute cells and KZG proofs for this blob
         // This returns ALL cell proofs (including extension cells)
         let (_, proofs) = trusted_setup.compute_cells_and_kzg_proofs(&blob)?;
@@ -188,6 +174,30 @@ pub fn prepare_sidecar_with_cells(
     )))
 }
 
+pub fn get_blobs_and_commitments(
+    state_diff: &[Vec<u8>],
+    trusted_setup: &KzgSettings,
+) -> EyreResult<((Vec<FixedBytes<BYTES_PER_BLOB>>, Vec<FixedBytes<48>>))> {
+    let mut sidecar_blobs = vec![];
+    let mut sidecar_commitments = vec![];
+
+    for blob_data in state_diff {
+        let fixed_size_blob: [u8; BYTES_PER_BLOB] = blob_data.as_slice().try_into()?;
+
+        let blob = Blob::new(fixed_size_blob);
+
+        let commitment = trusted_setup.blob_to_kzg_commitment(&blob)?;
+
+        sidecar_blobs.push(FixedBytes::new(fixed_size_blob));
+        sidecar_commitments.push(FixedBytes::new(commitment.to_bytes().into_inner()));
+    }
+
+    assert_eq!(state_diff.len(), sidecar_blobs.len());
+    assert_eq!(state_diff.len(), sidecar_commitments.len());
+
+    Ok((sidecar_blobs, sidecar_commitments))
+}
+
 /// Convert hex string data into Vec<u8>
 pub fn hex_string_to_u8_vec(hex_str: &str) -> color_eyre::Result<Vec<u8>> {
     // Remove any spaces or non-hex characters from the input string