diff --git a/crates/prune/prune/src/error.rs b/crates/prune/prune/src/error.rs index a2cbaebc13..b4779b7fdf 100644 --- a/crates/prune/prune/src/error.rs +++ b/crates/prune/prune/src/error.rs @@ -1,4 +1,4 @@ -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_errors::RethError; use reth_provider::ProviderError; use reth_prune_types::PruneSegmentError; diff --git a/crates/trie/trie/src/hashed_cursor/post_state.rs b/crates/trie/trie/src/hashed_cursor/post_state.rs index fffd66a73f..9b9403d3fd 100644 --- a/crates/trie/trie/src/hashed_cursor/post_state.rs +++ b/crates/trie/trie/src/hashed_cursor/post_state.rs @@ -3,7 +3,7 @@ use crate::{ forward_cursor::ForwardInMemoryCursor, HashedAccountsSorted, HashedPostStateSorted, HashedStorageSorted, }; -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_primitives::{Account, B256, U256}; use std::collections::HashSet; diff --git a/crates/trie/trie/src/node_iter.rs b/crates/trie/trie/src/node_iter.rs index 29c6fd4f23..6cf1bec1eb 100644 --- a/crates/trie/trie/src/node_iter.rs +++ b/crates/trie/trie/src/node_iter.rs @@ -1,5 +1,5 @@ use crate::{hashed_cursor::HashedCursor, trie_cursor::TrieCursor, walker::TrieWalker, Nibbles}; -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_primitives::B256; /// Represents a branch node in the trie. diff --git a/crates/trie/trie/src/state.rs b/crates/trie/trie/src/state.rs index 65222fdc0a..2cb9bfb3db 100644 --- a/crates/trie/trie/src/state.rs +++ b/crates/trie/trie/src/state.rs @@ -4,11 +4,12 @@ use crate::{ }; use itertools::Itertools; use rayon::prelude::{IntoParallelIterator, ParallelIterator}; -use reth_db::{tables, DatabaseError}; +use reth_db::tables; use reth_db_api::{ cursor::DbCursorRO, models::{AccountBeforeTx, BlockNumberAddress}, transaction::DbTx, + DatabaseError, }; use reth_primitives::{keccak256, Account, Address, BlockNumber, B256, U256}; use revm::db::BundleAccount; diff --git a/crates/trie/trie/src/trie_cursor/database_cursors.rs b/crates/trie/trie/src/trie_cursor/database_cursors.rs index dd64ca3c2d..987be370c1 100644 --- a/crates/trie/trie/src/trie_cursor/database_cursors.rs +++ b/crates/trie/trie/src/trie_cursor/database_cursors.rs @@ -4,11 +4,12 @@ use crate::{ }; use reth_db::{ cursor::{DbCursorRW, DbDupCursorRW}, - tables, DatabaseError, + tables, }; use reth_db_api::{ cursor::{DbCursorRO, DbDupCursorRO}, transaction::DbTx, + DatabaseError, }; use reth_primitives::B256; use reth_trie_common::StorageTrieEntry; diff --git a/crates/trie/trie/src/trie_cursor/in_memory.rs b/crates/trie/trie/src/trie_cursor/in_memory.rs index d02940e201..a454cc1b5c 100644 --- a/crates/trie/trie/src/trie_cursor/in_memory.rs +++ b/crates/trie/trie/src/trie_cursor/in_memory.rs @@ -3,7 +3,7 @@ use crate::{ forward_cursor::ForwardInMemoryCursor, updates::{StorageTrieUpdatesSorted, TrieUpdatesSorted}, }; -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_primitives::B256; use reth_trie_common::{BranchNodeCompact, Nibbles}; use std::collections::HashSet; diff --git a/crates/trie/trie/src/trie_cursor/mod.rs b/crates/trie/trie/src/trie_cursor/mod.rs index 0116f5b5a4..84b21f7dc5 100644 --- a/crates/trie/trie/src/trie_cursor/mod.rs +++ b/crates/trie/trie/src/trie_cursor/mod.rs @@ -1,5 +1,5 @@ use crate::{BranchNodeCompact, Nibbles}; -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_primitives::B256; /// Database implementations of trie cursors. diff --git a/crates/trie/trie/src/trie_cursor/noop.rs b/crates/trie/trie/src/trie_cursor/noop.rs index 8db0cbb9d3..e33729a6bb 100644 --- a/crates/trie/trie/src/trie_cursor/noop.rs +++ b/crates/trie/trie/src/trie_cursor/noop.rs @@ -1,6 +1,6 @@ use super::{TrieCursor, TrieCursorFactory}; use crate::{BranchNodeCompact, Nibbles}; -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_primitives::B256; /// Noop trie cursor factory. diff --git a/crates/trie/trie/src/walker.rs b/crates/trie/trie/src/walker.rs index 4e8d6f9e53..7d64ce3688 100644 --- a/crates/trie/trie/src/walker.rs +++ b/crates/trie/trie/src/walker.rs @@ -3,7 +3,7 @@ use crate::{ trie_cursor::{CursorSubNode, TrieCursor}, BranchNodeCompact, Nibbles, }; -use reth_db::DatabaseError; +use reth_db_api::DatabaseError; use reth_primitives::B256; use std::collections::HashSet;