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

refactor: remove Receipts struct (#14130)

Browse Source
This commit is contained in:
Arsenii Kulikov
2025-02-01 01:59:31 +04:00
committed by GitHub
parent d30a1b6c7d
commit 1c9ef8c5a3
32 changed files with 179 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/storage/db-common/src/init.rs
View File

@ -10,7 +10,7 @@ use reth_db::tables;
use reth_db_api::{transaction::DbTxMut, DatabaseError};
use reth_etl::Collector;
use reth_primitives::{
Account, Bytecode, GotExpected, NodePrimitives, Receipts, StaticFileSegment, StorageEntry,
Account, Bytecode, GotExpected, NodePrimitives, StaticFileSegment, StorageEntry,
};
use reth_provider::{
errors::provider::ProviderResult, providers::StaticFileWriter, writer::UnifiedStorageWriter,
@ -246,7 +246,7 @@ where
state_init,
all_reverts_init,
contracts,
Receipts::default(),
Vec::default(),
block,
Vec::new(),
);

2
crates/storage/provider/src/providers/blockchain_provider.rs
View File

@ -928,7 +928,7 @@ mod tests {
let senders = block.senders().expect("failed to recover senders");
let block_receipts = receipts.get(block.number as usize).unwrap().clone();
let execution_outcome =
ExecutionOutcome { receipts: block_receipts.into(), ..Default::default() };
ExecutionOutcome { receipts: vec![block_receipts], ..Default::default() };
ExecutedBlockWithTrieUpdates::new(
Arc::new(RecoveredBlock::new_sealed(block.clone(), senders)),

2
crates/storage/provider/src/providers/consistent.rs
View File

@ -208,7 +208,7 @@ impl<N: ProviderNodeTypes> ConsistentProvider<N> {
reverts,
// We skip new contracts since we never delete them from the database
Vec::new(),
receipts.into(),
receipts,
start_block_number,
Vec::new(),
)))

2
crates/storage/provider/src/providers/database/provider.rs
View File

@ -2289,7 +2289,7 @@ impl<TX: DbTxMut + DbTx + 'static, N: NodeTypesForProvider> StateWriter
state,
reverts,
Vec::new(),
receipts.into(),
receipts,
start_block_number,
Vec::new(),
))

15
crates/storage/provider/src/test_utils/blocks.rs
View File

@ -220,8 +220,7 @@ fn block1(number: BlockNumber) -> (RecoveredBlock<reth_primitives::Block>, Execu
)],
..Default::default()
},
]]
.into(),
]],
number,
Vec::new(),
);
@ -279,8 +278,7 @@ fn block2(
)],
..Default::default()
},
]]
.into(),
]],
number,
Vec::new(),
);
@ -347,8 +345,7 @@ fn block3(
)],
..Default::default()
},
]]
.into(),
]],
number,
Vec::new(),
);
@ -435,8 +432,7 @@ fn block4(
)],
..Default::default()
},
]]
.into(),
]],
number,
Vec::new(),
);
@ -520,8 +516,7 @@ fn block5(
)],
..Default::default()
},
]]
.into(),
]],
number,
Vec::new(),
);

21
crates/storage/provider/src/writer/mod.rs
View File

@ -235,7 +235,7 @@ mod tests {
transaction::{DbTx, DbTxMut},
};
use reth_execution_types::ExecutionOutcome;
use reth_primitives::{Account, Receipt, Receipts, StorageEntry};
use reth_primitives::{Account, Receipt, StorageEntry};
use reth_storage_api::{DatabaseProviderFactory, HashedPostStateProvider};
use reth_trie::{
test_utils::{state_root, storage_root_prehashed},
@ -498,8 +498,7 @@ mod tests {
state.merge_transitions(BundleRetention::Reverts);
let outcome =
ExecutionOutcome::new(state.take_bundle(), Receipts::default(), 1, Vec::new());
let outcome = ExecutionOutcome::new(state.take_bundle(), Default::default(), 1, Vec::new());
provider
.write_state(&outcome, OriginalValuesKnown::Yes, StorageLocation::Database)
.expect("Could not write bundle state to DB");
@ -598,8 +597,7 @@ mod tests {
)]));
state.merge_transitions(BundleRetention::Reverts);
let outcome =
ExecutionOutcome::new(state.take_bundle(), Receipts::default(), 2, Vec::new());
let outcome = ExecutionOutcome::new(state.take_bundle(), Default::default(), 2, Vec::new());
provider
.write_state(&outcome, OriginalValuesKnown::Yes, StorageLocation::Database)
.expect("Could not write bundle state to DB");
@ -666,7 +664,7 @@ mod tests {
init_state.merge_transitions(BundleRetention::Reverts);
let outcome =
ExecutionOutcome::new(init_state.take_bundle(), Receipts::default(), 0, Vec::new());
ExecutionOutcome::new(init_state.take_bundle(), Default::default(), 0, Vec::new());
provider
.write_state(&outcome, OriginalValuesKnown::Yes, StorageLocation::Database)
.expect("Could not write bundle state to DB");
@ -814,7 +812,7 @@ mod tests {
let bundle = state.take_bundle();
let outcome: ExecutionOutcome =
ExecutionOutcome::new(bundle, Receipts::default(), 1, Vec::new());
ExecutionOutcome::new(bundle, Default::default(), 1, Vec::new());
provider
.write_state(&outcome, OriginalValuesKnown::Yes, StorageLocation::Database)
.expect("Could not write bundle state to DB");
@ -979,7 +977,7 @@ mod tests {
)]));
init_state.merge_transitions(BundleRetention::Reverts);
let outcome =
ExecutionOutcome::new(init_state.take_bundle(), Receipts::default(), 0, Vec::new());
ExecutionOutcome::new(init_state.take_bundle(), Default::default(), 0, Vec::new());
provider
.write_state(&outcome, OriginalValuesKnown::Yes, StorageLocation::Database)
.expect("Could not write bundle state to DB");
@ -1025,8 +1023,7 @@ mod tests {
// Commit block #1 changes to the database.
state.merge_transitions(BundleRetention::Reverts);
let outcome =
ExecutionOutcome::new(state.take_bundle(), Receipts::default(), 1, Vec::new());
let outcome = ExecutionOutcome::new(state.take_bundle(), Default::default(), 1, Vec::new());
provider
.write_state(&outcome, OriginalValuesKnown::Yes, StorageLocation::Database)
.expect("Could not write bundle state to DB");
@ -1059,7 +1056,7 @@ mod tests {
fn revert_to_indices() {
let base: ExecutionOutcome = ExecutionOutcome {
bundle: BundleState::default(),
receipts: vec![vec![Receipt::default(); 2]; 7].into(),
receipts: vec![vec![Receipt::default(); 2]; 7],
first_block: 10,
requests: Vec::new(),
};
@ -1270,7 +1267,7 @@ mod tests {
let mut test: ExecutionOutcome = ExecutionOutcome {
bundle: present_state,
receipts: vec![vec![Receipt::default(); 2]; 1].into(),
receipts: vec![vec![Receipt::default(); 2]; 1],
first_block: 2,
requests: Vec::new(),
};