Skip to content

chore(deps): Rm redundant dep #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emhane merged 7 commits into from
Oct 20, 2025
Merged

chore(deps): Rm redundant dep #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2faa1a5
Removes redundant dep reth-db-api from reth-optimism-trie
emhane Oct 17, 2025
89ffe21
Merge branch 'unstable' into emhane/rm-redundant-dep
emhane Oct 17, 2025
020f6e4
Merge branch 'unstable' into emhane/rm-redundant-dep
emhane Oct 20, 2025
51ce3bd
Merge branch 'unstable' into emhane/rm-redundant-dep
emhane Oct 20, 2025
99adf23
Merge branch 'unstable' into emhane/rm-redundant-dep
emhane Oct 20, 2025
fdde279
Fix merge conflicts
emhane Oct 20, 2025
f502bfb
Add comment ab workaround to manifest
dhyaniarun1993 Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crates/optimism/trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <https://github.com/op-rs/op-reth/pull/234>
reth-db-api = { workspace = true, features = ["test-utils"] }
reth-trie = { workspace = true, features = ["test-utils"] }

[features]
Expand Down
12 changes: 4 additions & 8 deletions crates/optimism/trie/src/db/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/optimism/trie/src/proof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
Loading