chore: remove generate sidecar fn (paradigmxyz#12167)

juroberttyb · Oct 29, 2024 · 58f24e0 · 58f24e0
1 parent e92ecfb
commit 58f24e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 37 deletions.
diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs
@@ -31,8 +31,6 @@ pub use error::{
 };
 pub use meta::TransactionMeta;
 pub use pooled::{PooledTransactionsElement, PooledTransactionsElementEcRecovered};
-#[cfg(all(feature = "c-kzg", any(test, feature = "arbitrary")))]
-pub use sidecar::generate_blob_sidecar;
 #[cfg(feature = "c-kzg")]
 pub use sidecar::BlobTransactionValidationError;
 pub use sidecar::{BlobTransaction, BlobTransactionSidecar};

diff --git a/crates/primitives/src/transaction/sidecar.rs b/crates/primitives/src/transaction/sidecar.rs
@@ -191,35 +191,6 @@ impl BlobTransaction {
     }
 }
 
-/// Generates a [`BlobTransactionSidecar`] structure containing blobs, commitments, and proofs.
-#[cfg(all(feature = "c-kzg", any(test, feature = "arbitrary")))]
-pub fn generate_blob_sidecar(blobs: Vec<c_kzg::Blob>) -> BlobTransactionSidecar {
-    use alloc::vec::Vec;
-    use alloy_eips::eip4844::env_settings::EnvKzgSettings;
-    use c_kzg::{KzgCommitment, KzgProof};
-
-    let kzg_settings = EnvKzgSettings::Default;
-
-    let commitments: Vec<c_kzg::Bytes48> = blobs
-        .iter()
-        .map(|blob| {
-            KzgCommitment::blob_to_kzg_commitment(&blob.clone(), kzg_settings.get()).unwrap()
-        })
-        .map(|commitment| commitment.to_bytes())
-        .collect();
-
-    let proofs: Vec<c_kzg::Bytes48> = blobs
-        .iter()
-        .zip(commitments.iter())
-        .map(|(blob, commitment)| {
-            KzgProof::compute_blob_kzg_proof(blob, commitment, kzg_settings.get()).unwrap()
-        })
-        .map(|proof| proof.to_bytes())
-        .collect();
-
-    BlobTransactionSidecar::from_kzg(blobs, commitments, proofs)
-}
-
 #[cfg(all(test, feature = "c-kzg"))]
 mod tests {
     use super::*;
@@ -251,7 +222,7 @@ mod tests {
         .unwrap()];
 
         // Generate a BlobTransactionSidecar from the blobs
-        let sidecar = generate_blob_sidecar(blobs);
+        let sidecar = BlobTransactionSidecar::try_from_blobs(blobs).unwrap();
 
         // Assert commitment equality
         assert_eq!(
@@ -300,7 +271,7 @@ mod tests {
         }
 
         // Generate a BlobTransactionSidecar from the blobs
-        let sidecar = generate_blob_sidecar(blobs.clone());
+        let sidecar = BlobTransactionSidecar::try_from_blobs(blobs).unwrap();
 
         // Assert sidecar size
         assert_eq!(sidecar.size(), 524672);
@@ -325,7 +296,7 @@ mod tests {
         .unwrap()];
 
         // Generate a BlobTransactionSidecar from the blobs
-        let sidecar = generate_blob_sidecar(blobs);
+        let sidecar = BlobTransactionSidecar::try_from_blobs(blobs).unwrap();
 
         // Create a vector to store the encoded RLP
         let mut encoded_rlp = Vec::new();
@@ -356,7 +327,7 @@ mod tests {
         .unwrap()];
 
         // Generate a BlobTransactionSidecar from the blobs
-        let sidecar = generate_blob_sidecar(blobs);
+        let sidecar = BlobTransactionSidecar::try_from_blobs(blobs).unwrap();
 
         // Create a vector to store the encoded RLP
         let mut encoded_rlp = Vec::new();

diff --git a/crates/transaction-pool/src/pool/mod.rs b/crates/transaction-pool/src/pool/mod.rs
@@ -1236,7 +1236,8 @@ mod tests {
         validate::ValidTransaction,
         BlockInfo, PoolConfig, SubPoolLimit, TransactionOrigin, TransactionValidationOutcome, U256,
     };
-    use reth_primitives::{kzg::Blob, transaction::generate_blob_sidecar};
+    use alloy_eips::eip4844::BlobTransactionSidecar;
+    use reth_primitives::kzg::Blob;
     use std::{fs, path::PathBuf};
 
     #[test]
@@ -1271,7 +1272,7 @@ mod tests {
         .unwrap()];
 
         // Generate a BlobTransactionSidecar from the blobs.
-        let sidecar = generate_blob_sidecar(blobs);
+        let sidecar = BlobTransactionSidecar::try_from_blobs(blobs).unwrap();
 
         // Create an in-memory blob store.
         let blob_store = InMemoryBlobStore::default();