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: rm reth-interfaces (#8486)

Browse Source
This commit is contained in:
Matthias Seitz
2024-05-29 18:54:14 +02:00
committed by GitHub
parent bab8aaa29f
commit 42667e1cfd
9 changed files with 21 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/ef-tests/Cargo.toml
View File

@ -20,10 +20,10 @@ reth-primitives.workspace = true
reth-db = { workspace = true, features = ["mdbx", "test-utils"] }
reth-provider = { workspace = true, features = ["test-utils"] }
reth-stages.workspace = true
reth-interfaces.workspace = true
reth-evm-ethereum.workspace = true
alloy-rlp.workspace = true
walkdir = "2.3.3"
serde.workspace = true
serde_json.workspace = true

43
testing/ef-tests/src/cases/blockchain_test.rs
View File

@ -87,23 +87,20 @@ impl Case for BlockchainTestCase {
db.as_ref(),
Arc::new(case.network.clone().into()),
static_files_dir_path,
)
.map_err(|err| Error::RethError(err.into()))?
)?
.provider_rw()
.unwrap();
// Insert initial test state into the provider.
provider
.insert_historical_block(
SealedBlock::new(
case.genesis_block_header.clone().into(),
BlockBody::default(),
)
.try_seal_with_senders()
.unwrap(),
None,
provider.insert_historical_block(
SealedBlock::new(
case.genesis_block_header.clone().into(),
BlockBody::default(),
)
.map_err(|err| Error::RethError(err.into()))?;
.try_seal_with_senders()
.unwrap(),
None,
)?;
case.pre.write_to_db(provider.tx_ref())?;
// Initialize receipts static file with genesis
@ -119,12 +116,10 @@ impl Case for BlockchainTestCase {
// Decode and insert blocks, creating a chain of blocks for the test case.
let last_block = case.blocks.iter().try_fold(None, |_, block| {
let decoded = SealedBlock::decode(&mut block.rlp.as_ref())?;
provider
.insert_historical_block(
decoded.clone().try_seal_with_senders().unwrap(),
None,
)
.map_err(|err| Error::RethError(err.into()))?;
provider.insert_historical_block(
decoded.clone().try_seal_with_senders().unwrap(),
None,
)?;
Ok::<Option<SealedBlock>, Error>(Some(decoded))
})?;
provider
@ -157,13 +152,11 @@ impl Case for BlockchainTestCase {
(None, Some(expected_state_root)) => {
// Insert state hashes into the provider based on the expected state root.
let last_block = last_block.unwrap_or_default();
provider
.insert_hashes(
0..=last_block.number,
last_block.hash(),
*expected_state_root,
)
.map_err(|err| Error::RethError(err.into()))?;
provider.insert_hashes(
0..=last_block.number,
last_block.hash(),
*expected_state_root,
)?;
}
_ => return Err(Error::MissingPostState),
}

4
testing/ef-tests/src/result.rs
View File

@ -2,7 +2,7 @@
use crate::Case;
use reth_db::DatabaseError;
use reth_interfaces::RethError;
use reth_provider::ProviderError;
use std::path::{Path, PathBuf};
use thiserror::Error;
@ -46,7 +46,7 @@ pub enum Error {
Assertion(String),
/// An error internally in reth occurred.
#[error("test failed: {0}")]
RethError(#[from] RethError),
Provider(#[from] ProviderError),
/// An error occurred while decoding RLP.
#[error("an error occurred deserializing RLP: {0}")]
RlpDecodeError(#[from] alloy_rlp::Error),