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 Block (#10913)

Browse Source 
Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com>
This commit is contained in:
Rohit Narurkar
2024-09-24 11:14:08 +01:00
committed by GitHub
parent b06bc1088a
commit fb0555ae7d
70 changed files with 739 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -263,11 +263,15 @@ mod tests {
let (deposit_contract_addr, _) = random_eoa_account(&mut rng);
for block in &blocks {
for (txi, transaction) in block.body.iter().enumerate() {
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,
if txi == (block.body.len() - 1) { Some(deposit_contract_addr) } else { None },
if txi == (block.body.transactions.len() - 1) {
Some(deposit_contract_addr)
} else {
None
},
Some(1),
));
receipts.push((receipts.len() as u64, receipt));
@ -277,7 +281,7 @@ mod tests {
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
blocks.iter().map(|block| block.body.len()).sum::<usize>()
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>()
);
assert_eq!(
db.table::<tables::Transactions>().unwrap().len(),
@ -326,7 +330,7 @@ mod tests {
assert_eq!(
db.table::<tables::Receipts>().unwrap().len(),
blocks.iter().map(|block| block.body.len()).sum::<usize>() -
blocks.iter().map(|block| block.body.transactions.len()).sum::<usize>() -
((pruned_tx + 1) - unprunable) as usize
);

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

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

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

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