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

feat: use reth-ethereum-primitives (#13830)

Browse Source
This commit is contained in:
Arsenii Kulikov
2025-01-17 04:22:21 +04:00
committed by GitHub
parent 7e972ea23d
commit 8efe441cc0
67 changed files with 941 additions and 3025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/storage/provider/Cargo.toml
View File

@ -88,7 +88,6 @@ alloy-consensus.workspace = true
[features]
optimism = [
"reth-primitives/optimism",
"reth-execution-types/optimism",
"reth-optimism-primitives",
"reth-codecs/op",

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

@ -2402,7 +2402,7 @@ mod tests {
let mut in_memory_blocks: std::collections::VecDeque<_> = in_memory_blocks.into();
$(
let tx_hash = |block: &SealedBlock| block.body().transactions[0].hash();
let tx_hash = |block: &SealedBlock| *block.body().transactions[0].tx_hash();
let tx_num = |block: &SealedBlock| {
database_blocks
.iter()
@ -2726,7 +2726,7 @@ mod tests {
// above, we do not see it.
assert!(matches!(
old_transaction_hash_fn(
to_be_persisted_tx.hash(),
*to_be_persisted_tx.tx_hash(),
provider.canonical_in_memory_state(),
provider.database.clone()
),
@ -2743,7 +2743,7 @@ mod tests {
assert!(matches!(
correct_transaction_hash_fn(
to_be_persisted_tx.hash(),
*to_be_persisted_tx.tx_hash(),
provider.canonical_in_memory_state(),
provider.database
),

7
crates/storage/provider/src/providers/database/mod.rs
View File

@ -708,7 +708,7 @@ mod tests {
if sender == block.body().transactions[0].recover_signer().unwrap()
);
assert_matches!(
provider.transaction_id(block.body().transactions[0].hash()),
provider.transaction_id(*block.body().transactions[0].tx_hash()),
Ok(Some(0))
);
}
@ -726,7 +726,10 @@ mod tests {
Ok(_)
);
assert_matches!(provider.transaction_sender(0), Ok(None));
assert_matches!(provider.transaction_id(block.body().transactions[0].hash()), Ok(None));
assert_matches!(
provider.transaction_id(*block.body().transactions[0].tx_hash()),
Ok(None)
);
}
}

6
crates/storage/provider/src/test_utils/mock.rs
View File

@ -253,7 +253,7 @@ impl TransactionsProvider for MockEthProvider {
let tx_number = lock
.values()
.flat_map(|block| &block.body.transactions)
.position(|tx| tx.hash() == tx_hash)
.position(|tx| *tx.tx_hash() == tx_hash)
.map(|pos| pos as TxNumber);
Ok(tx_number)
@ -280,7 +280,7 @@ impl TransactionsProvider for MockEthProvider {
fn transaction_by_hash(&self, hash: TxHash) -> ProviderResult<Option<TransactionSigned>> {
Ok(self.blocks.lock().iter().find_map(|(_, block)| {
block.body.transactions.iter().find(|tx| tx.hash() == hash).cloned()
block.body.transactions.iter().find(|tx| *tx.tx_hash() == hash).cloned()
}))
}
@ -291,7 +291,7 @@ impl TransactionsProvider for MockEthProvider {
let lock = self.blocks.lock();
for (block_hash, block) in lock.iter() {
for (index, tx) in block.body.transactions.iter().enumerate() {
if tx.hash() == hash {
if *tx.tx_hash() == hash {
let meta = TransactionMeta {
tx_hash: hash,
index: index as u64,