From 2b4fa3bbf1403505a4a27b818ff4d89471627e28 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Tue, 26 Nov 2024 13:53:52 +0100 Subject: [PATCH] dep(trie): remove `reth-trie` dep from `reth-trie-sparse` (#12872) --- crates/trie/sparse/Cargo.toml | 1 - crates/trie/sparse/src/errors.rs | 2 +- crates/trie/sparse/src/state.rs | 2 +- crates/trie/sparse/src/trie.rs | 9 +++------ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/crates/trie/sparse/Cargo.toml b/crates/trie/sparse/Cargo.toml index 4c64bf716d..dce232fcd5 100644 --- a/crates/trie/sparse/Cargo.toml +++ b/crates/trie/sparse/Cargo.toml @@ -16,7 +16,6 @@ workspace = true # reth reth-tracing.workspace = true reth-trie-common.workspace = true -reth-trie.workspace = true # alloy alloy-primitives.workspace = true diff --git a/crates/trie/sparse/src/errors.rs b/crates/trie/sparse/src/errors.rs index 506b206fdd..a38a92395d 100644 --- a/crates/trie/sparse/src/errors.rs +++ b/crates/trie/sparse/src/errors.rs @@ -1,7 +1,7 @@ //! Errors for sparse trie. use alloy_primitives::{Bytes, B256}; -use reth_trie::Nibbles; +use reth_trie_common::Nibbles; use thiserror::Error; use crate::SparseNode; diff --git a/crates/trie/sparse/src/state.rs b/crates/trie/sparse/src/state.rs index d7e2f27b97..ec88abfd19 100644 --- a/crates/trie/sparse/src/state.rs +++ b/crates/trie/sparse/src/state.rs @@ -6,7 +6,7 @@ use alloy_primitives::{ Bytes, B256, }; use alloy_rlp::Decodable; -use reth_trie::{ +use reth_trie_common::{ updates::{StorageTrieUpdates, TrieUpdates}, Nibbles, TrieNode, }; diff --git a/crates/trie/sparse/src/trie.rs b/crates/trie/sparse/src/trie.rs index bab166d783..7797069759 100644 --- a/crates/trie/sparse/src/trie.rs +++ b/crates/trie/sparse/src/trie.rs @@ -6,13 +6,10 @@ use alloy_primitives::{ }; use alloy_rlp::Decodable; use reth_tracing::tracing::debug; -use reth_trie::{ - prefix_set::{PrefixSet, PrefixSetMut}, - BranchNodeCompact, RlpNode, -}; use reth_trie_common::{ - BranchNodeRef, ExtensionNodeRef, LeafNodeRef, Nibbles, TrieMask, TrieNode, CHILD_INDEX_RANGE, - EMPTY_ROOT_HASH, + prefix_set::{PrefixSet, PrefixSetMut}, + BranchNodeCompact, BranchNodeRef, ExtensionNodeRef, LeafNodeRef, Nibbles, RlpNode, TrieMask, + TrieNode, CHILD_INDEX_RANGE, EMPTY_ROOT_HASH, }; use smallvec::SmallVec; use std::{borrow::Cow, fmt};