diff --git a/crates/optimism/trie/Cargo.toml b/crates/optimism/trie/Cargo.toml index bbed81d116c..705a3969d3d 100644 --- a/crates/optimism/trie/Cargo.toml +++ b/crates/optimism/trie/Cargo.toml @@ -14,7 +14,6 @@ workspace = true [dependencies] # reth reth-db = { workspace = true, features = ["mdbx"] } -reth-db-api.workspace = true reth-evm.workspace = true reth-execution-errors.workspace = true reth-node-api.workspace = true @@ -52,6 +51,8 @@ tokio = { workspace = true, features = ["test-util", "rt-multi-thread", "macros" tempfile.workspace = true test-case.workspace = true reth-db = { workspace = true, features = ["test-utils"] } +# workaround for failing doc test +reth-db-api = { workspace = true, features = ["test-utils"] } reth-trie = { workspace = true, features = ["test-utils"] } [features] diff --git a/crates/optimism/trie/src/db/cursor.rs b/crates/optimism/trie/src/db/cursor.rs index d3f73dd388e..ff11b2b17fd 100644 --- a/crates/optimism/trie/src/db/cursor.rs +++ b/crates/optimism/trie/src/db/cursor.rs @@ -5,12 +5,11 @@ use crate::{ OpProofsHashedCursor, OpProofsStorageError, OpProofsStorageResult, OpProofsTrieCursor, }; use alloy_primitives::{B256, U256}; -use reth_db::DatabaseEnv; -use reth_db_api::{ +use reth_db::{ cursor::{DbCursorRO, DbDupCursorRO}, table::{DupSort, Table}, transaction::DbTx, - Database, + Database, DatabaseEnv, }; use reth_primitives_traits::Account; use reth_trie::{BranchNodeCompact, Nibbles, StoredNibbles}; @@ -296,13 +295,10 @@ mod tests { use super::*; use crate::db::models; use reth_db::{ - mdbx::{init_db_for, DatabaseArguments}, - DatabaseEnv, - }; - use reth_db_api::{ cursor::DbDupCursorRW, + mdbx::{init_db_for, DatabaseArguments}, transaction::{DbTx, DbTxMut}, - Database, + Database, DatabaseEnv, }; use reth_trie::{BranchNodeCompact, Nibbles, StoredNibbles}; use tempfile::TempDir; diff --git a/crates/optimism/trie/src/proof.rs b/crates/optimism/trie/src/proof.rs index faa987267e0..0df47e6e848 100644 --- a/crates/optimism/trie/src/proof.rs +++ b/crates/optimism/trie/src/proof.rs @@ -9,7 +9,7 @@ use alloy_primitives::{ map::{B256Map, HashMap}, Address, Bytes, B256, U256, }; -use reth_db_api::DatabaseError; +use reth_db::DatabaseError; use reth_execution_errors::{StateProofError, StateRootError, StorageRootError, TrieWitnessError}; use reth_primitives_traits::Account; use reth_trie::{