From e67bb28be30ef216d56953216419a818a64184fe Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Wed, 29 May 2024 23:32:00 +0300
Subject: [PATCH] chore(net): test utils improvements (#8493)

---
 crates/net/downloaders/src/bodies/test_utils.rs | 6 +++---
 crates/net/downloaders/src/test_utils/mod.rs    | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/net/downloaders/src/bodies/test_utils.rs b/crates/net/downloaders/src/bodies/test_utils.rs
index 591e312edc..f5cffbc263 100644
--- a/crates/net/downloaders/src/bodies/test_utils.rs
+++ b/crates/net/downloaders/src/bodies/test_utils.rs
@@ -30,15 +30,15 @@ pub(crate) fn zip_blocks<'a>(
         .collect()
 }
 
-pub(crate) fn create_raw_bodies<'a>(
-    headers: impl Iterator<Item = &'a SealedHeader>,
+pub(crate) fn create_raw_bodies(
+    headers: impl IntoIterator<Item = SealedHeader>,
     bodies: &mut HashMap<B256, BlockBody>,
 ) -> Vec<Block> {
     headers
         .into_iter()
         .map(|header| {
             let body = bodies.remove(&header.hash()).expect("body exists");
-            body.create_block(header.as_ref().clone())
+            body.create_block(header.unseal())
         })
         .collect()
 }
diff --git a/crates/net/downloaders/src/test_utils/mod.rs b/crates/net/downloaders/src/test_utils/mod.rs
index fdbcfea230..aff864ed53 100644
--- a/crates/net/downloaders/src/test_utils/mod.rs
+++ b/crates/net/downloaders/src/test_utils/mod.rs
@@ -48,15 +48,16 @@ pub(crate) async fn generate_bodies_file(
     range: RangeInclusive<u64>,
 ) -> (tokio::fs::File, Vec<SealedHeader>, HashMap<B256, BlockBody>) {
     let (headers, bodies) = generate_bodies(range);
-    let raw_block_bodies = create_raw_bodies(headers.clone().iter(), &mut bodies.clone());
+    let raw_block_bodies = create_raw_bodies(headers.iter().cloned(), &mut bodies.clone());
 
     let file: File = tempfile::tempfile().unwrap().into();
     let mut writer = FramedWrite::new(file, BlockFileCodec);
 
     // rlp encode one after the other
     for block in raw_block_bodies {
-        writer.send(block).await.unwrap();
+        writer.feed(block).await.unwrap();
     }
+    writer.flush().await.unwrap();
 
     // get the file back
     let mut file: File = writer.into_inner();