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 block field private (#13628)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-03 16:10:32 +01:00
committed by GitHub
parent 82013f46da
commit dbd4f0c4fe
67 changed files with 317 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/prune/prune/src/segments/mod.rs
View File

@ -242,7 +242,8 @@ mod tests {
let range = input.get_next_tx_num_range(&provider).expect("Expected range").unwrap();
// Calculate the total number of transactions
let num_txs = blocks.iter().map(|block| block.body.transactions.len() as u64).sum::<u64>();
let num_txs =
blocks.iter().map(|block| block.body().transactions.len() as u64).sum::<u64>();
assert_eq!(range, 0..=num_txs - 1);
}
@ -288,7 +289,8 @@ mod tests {
let range = input.get_next_tx_num_range(&provider).expect("Expected range").unwrap();
// Calculate the total number of transactions
let num_txs = blocks.iter().map(|block| block.body.transactions.len() as u64).sum::<u64>();
let num_txs =
blocks.iter().map(|block| block.body().transactions.len() as u64).sum::<u64>();
assert_eq!(range, 0..=num_txs - 1,);
}
@ -322,7 +324,8 @@ mod tests {
// Get the last tx number
// Calculate the total number of transactions
let num_txs = blocks.iter().map(|block| block.body.transactions.len() as u64).sum::<u64>();
let num_txs =
blocks.iter().map(|block| block.body().transactions.len() as u64).sum::<u64>();
let max_range = num_txs - 1;
// Create a prune input with a previous checkpoint that is the last tx number

10
crates/prune/prune/src/segments/receipts.rs
View File

@ -113,8 +113,8 @@ mod tests {
let mut receipts = Vec::new();
for block in &blocks {
receipts.reserve_exact(block.body.transactions.len());
for transaction in &block.body.transactions {
receipts.reserve_exact(block.body().transactions.len());
for transaction in &block.body().transactions {
receipts
.push((receipts.len() as u64, random_receipt(&mut rng, transaction, Some(0))));
}
@ -124,7 +124,7 @@ mod tests {
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>()
blocks.iter().map(|block| block.body().transactions.len()).sum::<usize>()
);
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
@ -158,7 +158,7 @@ mod tests {
let last_pruned_tx_number = blocks
.iter()
.take(to_block as usize)
.map(|block| block.body.transactions.len())
.map(|block| block.body().transactions.len())
.sum::<usize>()
.min(
next_tx_number_to_prune as usize +
@ -186,7 +186,7 @@ mod tests {
let last_pruned_block_number = blocks
.iter()
.fold_while((0, 0), |(_, mut tx_count), block| {
tx_count += block.body.transactions.len();
tx_count += block.body().transactions.len();
if tx_count > last_pruned_tx_number {
Done((block.number, tx_count))

6
crates/prune/prune/src/segments/static_file/transactions.rs
View File

@ -124,7 +124,7 @@ mod tests {
db.insert_blocks(blocks.iter(), StorageKind::Database(None)).expect("insert blocks");
let transactions =
blocks.iter().flat_map(|block| &block.body.transactions).collect::<Vec<_>>();
blocks.iter().flat_map(|block| &block.body().transactions).collect::<Vec<_>>();
assert_eq!(db.table::<tables::Transactions>().unwrap().len(), transactions.len());
@ -174,7 +174,7 @@ mod tests {
let last_pruned_tx_number = blocks
.iter()
.take(to_block as usize)
.map(|block| block.body.transactions.len())
.map(|block| block.body().transactions.len())
.sum::<usize>()
.min(
next_tx_number_to_prune as usize +
@ -185,7 +185,7 @@ mod tests {
let last_pruned_block_number = blocks
.iter()
.fold_while((0, 0), |(_, mut tx_count), block| {
tx_count += block.body.transactions.len();
tx_count += block.body().transactions.len();
if tx_count > last_pruned_tx_number {
Done((block.number, tx_count))

10
crates/prune/prune/src/segments/user/receipts_by_logs.rs
View File

@ -273,12 +273,12 @@ mod tests {
let (deposit_contract_addr, _) = random_eoa_account(&mut rng);
for block in &blocks {
receipts.reserve_exact(block.body.size());
for (txi, transaction) in block.body.transactions.iter().enumerate() {
receipts.reserve_exact(block.body().size());
for (txi, transaction) in block.body().transactions.iter().enumerate() {
let mut receipt = random_receipt(&mut rng, transaction, Some(1));
receipt.logs.push(random_log(
&mut rng,
(txi == (block.body.transactions.len() - 1)).then_some(deposit_contract_addr),
(txi == (block.body().transactions.len() - 1)).then_some(deposit_contract_addr),
Some(1),
));
receipts.push((receipts.len() as u64, receipt));
@ -288,7 +288,7 @@ mod tests {
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>()
blocks.iter().map(|block| block.body().transactions.len()).sum::<usize>()
);
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
@ -337,7 +337,7 @@ mod tests {
assert_eq!(
db.table::<tables::Receipts>().unwrap().len(),
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>() -
blocks.iter().map(|block| block.body().transactions.len()).sum::<usize>() -
((pruned_tx + 1) - unprunable) as usize
);

10
crates/prune/prune/src/segments/user/sender_recovery.rs
View File

@ -111,8 +111,8 @@ mod tests {
let mut transaction_senders = Vec::new();
for block in &blocks {
transaction_senders.reserve_exact(block.body.transactions.len());
for transaction in &block.body.transactions {
transaction_senders.reserve_exact(block.body().transactions.len());
for transaction in &block.body().transactions {
transaction_senders.push((
transaction_senders.len() as u64,
transaction.recover_signer().expect("recover signer"),
@ -124,7 +124,7 @@ mod tests {
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>()
blocks.iter().map(|block| block.body().transactions.len()).sum::<usize>()
);
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
@ -159,7 +159,7 @@ mod tests {
let last_pruned_tx_number = blocks
.iter()
.take(to_block as usize)
.map(|block| block.body.transactions.len())
.map(|block| block.body().transactions.len())
.sum::<usize>()
.min(
next_tx_number_to_prune as usize +
@ -170,7 +170,7 @@ mod tests {
let last_pruned_block_number = blocks
.iter()
.fold_while((0, 0), |(_, mut tx_count), block| {
tx_count += block.body.transactions.len();
tx_count += block.body().transactions.len();
if tx_count > last_pruned_tx_number {
Done((block.number, tx_count))

10
crates/prune/prune/src/segments/user/transaction_lookup.rs
View File

@ -139,8 +139,8 @@ mod tests {
let mut tx_hash_numbers = Vec::new();
for block in &blocks {
tx_hash_numbers.reserve_exact(block.body.transactions.len());
for transaction in &block.body.transactions {
tx_hash_numbers.reserve_exact(block.body().transactions.len());
for transaction in &block.body().transactions {
tx_hash_numbers.push((transaction.hash(), tx_hash_numbers.len() as u64));
}
}
@ -149,7 +149,7 @@ mod tests {
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>()
blocks.iter().map(|block| block.body().transactions.len()).sum::<usize>()
);
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
@ -184,7 +184,7 @@ mod tests {
let last_pruned_tx_number = blocks
.iter()
.take(to_block as usize)
.map(|block| block.body.transactions.len())
.map(|block| block.body().transactions.len())
.sum::<usize>()
.min(
next_tx_number_to_prune as usize +
@ -195,7 +195,7 @@ mod tests {
let last_pruned_block_number = blocks
.iter()
.fold_while((0, 0), |(_, mut tx_count), block| {
tx_count += block.body.transactions.len();
tx_count += block.body().transactions.len();
if tx_count > last_pruned_tx_number {
Done((block.number, tx_count))