chore: move proof types and root functions from primitives/proofs i…

…nto `reth-trie-common` (#8724)

Co-authored-by: Matthias Seitz <[email protected]>

Cargo.toml

@@ -99,9 +99,9 @@ members = [
     "crates/tokio-util/",
     "crates/tracing/",
     "crates/transaction-pool/",
+    "crates/trie/common",
     "crates/trie/parallel/",
     "crates/trie/trie",
-    "crates/trie/types",
     "examples/beacon-api-sidecar-fetcher/",
     "examples/beacon-api-sse/",
     "examples/bsc-p2p",
@@ -332,8 +332,8 @@ reth-tokio-util = { path = "crates/tokio-util" }
 reth-tracing = { path = "crates/tracing" }
 reth-transaction-pool = { path = "crates/transaction-pool" }
 reth-trie = { path = "crates/trie/trie" }
+reth-trie-common = { path = "crates/trie/common" }
 reth-trie-parallel = { path = "crates/trie/parallel" }
-reth-trie-types = { path = "crates/trie/types" }
 
 # revm
 revm = { version = "9.0.0", features = [

crates/blockchain-tree/src/blockchain_tree.rs

@@ -1383,7 +1383,7 @@ mod tests {
     use reth_primitives::{
         constants::{EIP1559_INITIAL_BASE_FEE, EMPTY_ROOT_HASH, ETHEREUM_BLOCK_GAS_LIMIT},
         keccak256,
-        proofs::{calculate_transaction_root, state_root_unhashed},
+        proofs::calculate_transaction_root,
         revm_primitives::AccountInfo,
         Account, Address, ChainSpecBuilder, Genesis, GenesisAccount, Header, Signature,
         Transaction, TransactionSigned, TransactionSignedEcRecovered, TxEip1559, Withdrawals, B256,
@@ -1394,7 +1394,7 @@ mod tests {
         ProviderFactory,
     };
     use reth_stages_api::StageCheckpoint;
-    use reth_trie::StateRoot;
+    use reth_trie::{root::state_root_unhashed, StateRoot};
     use std::collections::HashMap;
 
     fn setup_externals(