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

chore!: make senders fields private (#13752)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-09 14:58:09 +01:00
committed by GitHub
parent 66f934b8d0
commit bf65ed45c5
15 changed files with 117 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/engine/tree/src/download.rs
View File

@ -233,10 +233,9 @@ where
.into_iter()
.map(|b| {
let senders = b.senders().unwrap_or_default();
OrderedSealedBlockWithSenders(SealedBlockWithSenders {
block: b,
senders,
})
OrderedSealedBlockWithSenders(SealedBlockWithSenders::new_unchecked(
b, senders,
))
})
.map(Reverse),
);
@ -290,14 +289,13 @@ impl<B: Block> Ord for OrderedSealedBlockWithSenders<B> {
impl<B: Block> From<SealedBlockFor<B>> for OrderedSealedBlockWithSenders<B> {
fn from(block: SealedBlockFor<B>) -> Self {
let senders = block.senders().unwrap_or_default();
Self(SealedBlockWithSenders { block, senders })
Self(SealedBlockWithSenders::new_unchecked(block, senders))
}
}
impl<B: Block> From<OrderedSealedBlockWithSenders<B>> for SealedBlockWithSenders<B> {
fn from(value: OrderedSealedBlockWithSenders<B>) -> Self {
let senders = value.0.senders;
Self { block: value.0.block, senders }
value.0
}
}

19
crates/engine/tree/src/tree/mod.rs
View File

@ -1597,10 +1597,11 @@ where
return Ok(None)
};
let SealedBlockWithSenders { block, senders } = self
let (block, senders) = self
.provider
.sealed_block_with_senders(hash.into(), TransactionVariant::WithHash)?
.ok_or_else(|| ProviderError::HeaderNotFound(hash.into()))?;
.ok_or_else(|| ProviderError::HeaderNotFound(hash.into()))?
.split();
let execution_output = self
.provider
.get_state(block.number())?
@ -2452,7 +2453,7 @@ where
let executed: ExecutedBlock<N> = ExecutedBlock {
block: sealed_block.clone(),
senders: Arc::new(block.senders),
senders: Arc::new(block.senders().to_vec()),
execution_output: Arc::new(ExecutionOutcome::from((output, block_number))),
hashed_state: Arc::new(hashed_state),
trie: Arc::new(trie_output),
@ -3002,9 +3003,11 @@ mod tests {
self.persist_blocks(
blocks
.into_iter()
.map(|b| SealedBlockWithSenders {
block: (*b.block).clone(),
senders: b.senders.to_vec(),
.map(|b| {
SealedBlockWithSenders::new_unchecked(
(*b.block).clone(),
b.senders().clone(),
)
})
.collect(),
);
@ -3710,7 +3713,7 @@ mod tests {
for block in &chain_a {
test_harness.tree.state.tree_state.insert_executed(ExecutedBlock {
block: Arc::new(block.block.clone()),
senders: Arc::new(block.senders.clone()),
senders: Arc::new(block.senders().to_vec()),
execution_output: Arc::new(ExecutionOutcome::default()),
hashed_state: Arc::new(HashedPostState::default()),
trie: Arc::new(TrieUpdates::default()),
@ -3721,7 +3724,7 @@ mod tests {
for block in &chain_b {
test_harness.tree.state.tree_state.insert_executed(ExecutedBlock {
block: Arc::new(block.block.clone()),
senders: Arc::new(block.senders.clone()),
senders: Arc::new(block.senders().to_vec()),
execution_output: Arc::new(ExecutionOutcome::default()),
hashed_state: Arc::new(HashedPostState::default()),
trie: Arc::new(TrieUpdates::default()),