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 from reth-trie (#8419)

Browse Source
This commit is contained in:
Matthias Seitz
2024-05-27 19:55:11 +02:00
committed by GitHub
parent 749d68b5e4
commit 21b23862fd
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/trie/Cargo.toml
View File

@ -14,8 +14,9 @@ workspace = true
[dependencies]
# reth
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-execution-errors.workspace = true
reth-db.workspace = true
revm.workspace = true
# alloy
@ -41,6 +42,7 @@ triehash = { version = "0.8", optional = true }
reth-primitives = { workspace = true, features = ["test-utils", "arbitrary"] }
reth-db = { workspace = true, features = ["test-utils"] }
reth-provider = { workspace = true, features = ["test-utils"] }
reth-storage-errors.workspace = true
# trie
triehash = "0.8"

6
crates/trie/src/proof.rs
View File

@ -7,7 +7,7 @@ use crate::{
};
use alloy_rlp::{BufMut, Encodable};
use reth_db::{tables, transaction::DbTx};
use reth_interfaces::trie::{StateRootError, StorageRootError};
use reth_execution_errors::{StateRootError, StorageRootError};
use reth_primitives::{
constants::EMPTY_ROOT_HASH,
keccak256,
@ -168,9 +168,9 @@ mod tests {
use crate::StateRoot;
use once_cell::sync::Lazy;
use reth_db::database::Database;
use reth_interfaces::RethResult;
use reth_primitives::{Account, Bytes, Chain, ChainSpec, StorageEntry, HOLESKY, MAINNET, U256};
use reth_provider::{test_utils::create_test_provider_factory, HashingWriter, ProviderFactory};
use reth_storage_errors::provider::ProviderResult;
use std::{str::FromStr, sync::Arc};
/*
@ -201,7 +201,7 @@ mod tests {
fn insert_genesis<DB: Database>(
provider_factory: &ProviderFactory<DB>,
chain_spec: Arc<ChainSpec>,
) -> RethResult<B256> {
) -> ProviderResult<B256> {
let mut provider = provider_factory.provider_rw()?;
// Hash accounts and insert them into hashing table.

2
crates/trie/src/state.rs
View File

@ -11,7 +11,7 @@ use reth_db::{
transaction::DbTx,
DatabaseError,
};
use reth_interfaces::trie::StateRootError;
use reth_execution_errors::StateRootError;
use reth_primitives::{
keccak256, revm::compat::into_reth_acc, trie::Nibbles, Account, Address, BlockNumber, B256,
U256,

2
crates/trie/src/trie.rs
View File

@ -10,7 +10,7 @@ use crate::{
};
use alloy_rlp::{BufMut, Encodable};
use reth_db::transaction::DbTx;
use reth_interfaces::trie::{StateRootError, StorageRootError};
use reth_execution_errors::{StateRootError, StorageRootError};
use reth_primitives::{
constants::EMPTY_ROOT_HASH,
keccak256,

3
crates/trie/src/updates.rs
View File

@ -1,3 +1,4 @@
use crate::walker::TrieWalker;
use derive_more::Deref;
use reth_db::{
cursor::{DbCursorRO, DbCursorRW, DbDupCursorRO, DbDupCursorRW},
@ -13,8 +14,6 @@ use reth_primitives::{
};
use std::collections::{hash_map::IntoIter, HashMap, HashSet};
use crate::walker::TrieWalker;
/// The key of a trie node.
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum TrieKey {