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: store plain receipts instead Options in Receipts (#14010)

Browse Source
This commit is contained in:
Arsenii Kulikov
2025-01-27 20:05:48 +04:00
committed by GitHub
parent 0fa79c6c65
commit cde951732e
22 changed files with 88 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/optimism/evm/src/execute.rs
View File

@ -442,8 +442,8 @@ mod tests {
.unwrap();
let receipts = executor.receipts();
let tx_receipt = receipts[0][0].as_ref().unwrap();
let deposit_receipt = receipts[0][1].as_ref().unwrap();
let tx_receipt = &receipts[0][0];
let deposit_receipt = &receipts[0][1];
assert!(!matches!(tx_receipt, OpReceipt::Deposit(_)));
// deposit_nonce is present only in deposit transactions
@ -518,8 +518,8 @@ mod tests {
.expect("Executing a block while canyon is active should not fail");
let receipts = executor.receipts();
let tx_receipt = receipts[0][0].as_ref().unwrap();
let deposit_receipt = receipts[0][1].as_ref().unwrap();
let tx_receipt = &receipts[0][0];
let deposit_receipt = &receipts[0][1];
// deposit_receipt_version is set to 1 for post canyon deposit transactions
assert!(!matches!(tx_receipt, OpReceipt::Deposit(_)));

9
crates/optimism/evm/src/lib.rs
View File

@ -528,8 +528,7 @@ mod tests {
});
// Create a Receipts object with a vector of receipt vectors
let receipts =
Receipts { receipt_vec: vec![vec![Some(receipt1.clone())], vec![Some(receipt2)]] };
let receipts = Receipts { receipt_vec: vec![vec![receipt1.clone()], vec![receipt2]] };
// Create an ExecutionOutcome object with the created bundle, receipts, an empty requests
// vector, and first_block set to 10
@ -551,7 +550,7 @@ mod tests {
// Create an ExecutionOutcome object with a single receipt vector containing receipt1
let execution_outcome1 = ExecutionOutcome {
bundle: Default::default(),
receipts: Receipts { receipt_vec: vec![vec![Some(receipt1)]] },
receipts: Receipts { receipt_vec: vec![vec![receipt1]] },
requests: vec![],
first_block: 10,
};
@ -667,11 +666,11 @@ mod tests {
fn test_get_logs() {
// Create a Receipts object with a vector of receipt vectors
let receipts = Receipts {
receipt_vec: vec![vec![Some(OpReceipt::Legacy(Receipt {
receipt_vec: vec![vec![OpReceipt::Legacy(Receipt {
cumulative_gas_used: 46913,
logs: vec![Log::<LogData>::default()],
status: true.into(),
}))]],
})]],
};
// Define the first block number