jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

primitives: use SealedHeader::seal (#12507)

Browse Source
This commit is contained in:
Thomas Coratger
2024-11-13 13:41:56 +01:00
committed by GitHub
parent 527767cc34
commit 9313737dbb
32 changed files with 108 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/net/p2p/src/full_block.rs
View File

@ -199,15 +199,8 @@ where
ResponseResult::Header(res) => {
match res {
Ok(maybe_header) => {
let (peer, maybe_header) = maybe_header
.map(|h| {
h.map(|h| {
let sealed = h.seal_slow();
let (header, seal) = sealed.into_parts();
SealedHeader::new(header, seal)
})
})
.split();
let (peer, maybe_header) =
maybe_header.map(|h| h.map(SealedHeader::seal)).split();
if let Some(header) = maybe_header {
if header.hash() == this.hash {
this.header = Some(header);
@ -457,17 +450,8 @@ where
}
fn on_headers_response(&mut self, headers: WithPeerId<Vec<Client::Header>>) {
let (peer, mut headers_falling) = headers
.map(|h| {
h.into_iter()
.map(|h| {
let sealed = h.seal_slow();
let (header, seal) = sealed.into_parts();
SealedHeader::new(header, seal)
})
.collect::<Vec<_>>()
})
.split();
let (peer, mut headers_falling) =
headers.map(|h| h.into_iter().map(SealedHeader::seal).collect::<Vec<_>>()).split();
// fill in the response if it's the correct length
if headers_falling.len() == self.count as usize {
@ -707,9 +691,7 @@ mod tests {
header.parent_hash = hash;
header.number += 1;
let sealed = header.seal_slow();
let (header, seal) = sealed.into_parts();
sealed_header = SealedHeader::new(header, seal);
sealed_header = SealedHeader::seal(header);
client.insert(sealed_header.clone(), body.clone());
}

13
crates/net/p2p/src/test_utils/headers.rs
View File

@ -10,7 +10,6 @@ use crate::{
},
priority::Priority,
};
use alloy_primitives::Sealable;
use futures::{Future, FutureExt, Stream, StreamExt};
use reth_consensus::{test_utils::TestConsensus, Consensus};
use reth_eth_wire_types::HeadersDirection;
@ -160,16 +159,8 @@ impl Stream for TestDownload {
match ready!(this.get_or_init_fut().poll_unpin(cx)) {
Ok(resp) => {
// Skip head and seal headers
let mut headers = resp
.1
.into_iter()
.skip(1)
.map(|header| {
let sealed = header.seal_slow();
let (header, seal) = sealed.into_parts();
SealedHeader::new(header, seal)
})
.collect::<Vec<_>>();
let mut headers =
resp.1.into_iter().skip(1).map(SealedHeader::seal).collect::<Vec<_>>();
headers.sort_unstable_by_key(|h| h.number);
headers.into_iter().for_each(|h| this.buffer.push(h));
this.done = true;