chore: replace trie-common dep with alloy-trie (#13652)

paradigmxyz · Jan 4, 2025 · 72eabe0 · 72eabe0
1 parent 2c94d7b
commit 72eabe0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/chainspec/Cargo.toml b/crates/chainspec/Cargo.toml
@@ -14,7 +14,7 @@ workspace = true
 # reth
 reth-ethereum-forks.workspace = true
 reth-network-peers.workspace = true
-reth-trie-common.workspace = true
+alloy-trie = { workspace = true, features = ["ethereum"] }
 reth-primitives-traits.workspace = true
 
 # ethereum
@@ -52,20 +52,17 @@ std = [
 	"reth-ethereum-forks/std",
 	"derive_more/std",
 	"reth-network-peers/std",
-	"reth-trie-common/std",
 	"serde_json/std"
 ]
 arbitrary = [
 	"alloy-chains/arbitrary",
 	"reth-ethereum-forks/arbitrary",
 	"reth-primitives-traits/arbitrary",
-	"reth-trie-common/arbitrary",
 	"alloy-consensus/arbitrary",
 	"alloy-eips/arbitrary",
 	"alloy-primitives/arbitrary",
 	"alloy-trie/arbitrary"
 ]
 test-utils = [
 	"reth-primitives-traits/test-utils",
-	"reth-trie-common/test-utils"
 ]
diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs
@@ -18,6 +18,7 @@ use alloy_eips::{
 };
 use alloy_genesis::Genesis;
 use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256};
+use alloy_trie::root::state_root_ref_unhashed;
 use derive_more::From;
 use reth_ethereum_forks::{
     ChainHardforks, DisplayHardforks, EthereumHardfork, EthereumHardforks, ForkCondition,
@@ -28,7 +29,6 @@ use reth_network_peers::{
     sepolia_nodes, NodeRecord,
 };
 use reth_primitives_traits::SealedHeader;
-use reth_trie_common::root::state_root_ref_unhashed;
 
 /// The Ethereum mainnet spec
 pub static MAINNET: LazyLock<Arc<ChainSpec>> = LazyLock::new(|| {
@@ -1023,17 +1023,14 @@ pub fn test_fork_ids(spec: &ChainSpec, cases: &[(Head, ForkId)]) {
 
 #[cfg(test)]
 mod tests {
-    use core::ops::Deref;
-    use std::{collections::HashMap, str::FromStr};
-
+    use super::*;
     use alloy_chains::Chain;
     use alloy_genesis::{ChainConfig, GenesisAccount};
     use alloy_primitives::{b256, hex};
-    use alloy_trie::EMPTY_ROOT_HASH;
+    use alloy_trie::{TrieAccount, EMPTY_ROOT_HASH};
+    use core::ops::Deref;
     use reth_ethereum_forks::{ForkCondition, ForkHash, ForkId, Head};
-    use reth_trie_common::TrieAccount;
-
-    use super::*;
+    use std::{collections::HashMap, str::FromStr};
 
     fn test_hardfork_fork_ids(spec: &ChainSpec, cases: &[(EthereumHardfork, ForkId)]) {
         for (hardfork, expected_id) in cases {

diff --git a/crates/optimism/consensus/Cargo.toml b/crates/optimism/consensus/Cargo.toml
@@ -17,7 +17,6 @@ reth-chainspec.workspace = true
 reth-consensus-common.workspace = true
 reth-consensus.workspace = true
 reth-primitives.workspace = true
-reth-trie-common.workspace = true
 
 # op-reth
 reth-optimism-forks.workspace = true