chore(db): move mod tables to db-api (#14540)

Co-authored-by: Matthias Seitz <[email protected]>
paradigmxyz · Feb 17, 2025 · 482f455 · 482f455
1 parent 336c3d1
commit 482f455
Show file tree

Hide file tree

Showing 106 changed files with 269 additions and 274 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/reth/src/commands/debug_cmd/merkle.rs b/bin/reth/src/commands/debug_cmd/merkle.rs
@@ -11,8 +11,7 @@ use reth_cli_runner::CliContext;
 use reth_cli_util::get_secret_key;
 use reth_config::Config;
 use reth_consensus::{Consensus, ConsensusError};
-use reth_db::tables;
-use reth_db_api::{cursor::DbCursorRO, transaction::DbTx};
+use reth_db_api::{cursor::DbCursorRO, tables, transaction::DbTx};
 use reth_ethereum_primitives::EthPrimitives;
 use reth_evm::execute::{BlockExecutorProvider, Executor};
 use reth_network::{BlockDownloaderProvider, NetworkHandle};

diff --git a/crates/cli/commands/src/db/checksum.rs b/crates/cli/commands/src/db/checksum.rs
@@ -5,8 +5,11 @@ use crate::{
 use ahash::RandomState;
 use clap::Parser;
 use reth_chainspec::EthereumHardforks;
-use reth_db::{DatabaseEnv, RawKey, RawTable, RawValue, TableViewer, Tables};
-use reth_db_api::{cursor::DbCursorRO, table::Table, transaction::DbTx};
+use reth_db::DatabaseEnv;
+use reth_db_api::{
+    cursor::DbCursorRO, table::Table, transaction::DbTx, RawKey, RawTable, RawValue, TableViewer,
+    Tables,
+};
 use reth_db_common::DbTool;
 use reth_node_builder::{NodeTypesWithDB, NodeTypesWithDBAdapter};
 use reth_provider::{providers::ProviderNodeTypes, DBProvider};

diff --git a/crates/cli/commands/src/db/clear.rs b/crates/cli/commands/src/db/clear.rs
@@ -1,9 +1,10 @@
 use clap::{Parser, Subcommand};
-use reth_db::{static_file::iter_static_files, TableViewer, Tables};
+use reth_db::static_file::iter_static_files;
 use reth_db_api::{
     database::Database,
     table::Table,
     transaction::{DbTx, DbTxMut},
+    TableViewer, Tables,
 };
 use reth_node_builder::NodeTypesWithDB;
 use reth_provider::{ProviderFactory, StaticFileProviderFactory};

diff --git a/crates/cli/commands/src/db/diff.rs b/crates/cli/commands/src/db/diff.rs
@@ -1,6 +1,8 @@
 use clap::Parser;
-use reth_db::{open_db_read_only, tables_to_generic, DatabaseEnv, Tables};
-use reth_db_api::{cursor::DbCursorRO, database::Database, table::Table, transaction::DbTx};
+use reth_db::{open_db_read_only, tables_to_generic, DatabaseEnv};
+use reth_db_api::{
+    cursor::DbCursorRO, database::Database, table::Table, transaction::DbTx, Tables,
+};
 use reth_db_common::DbTool;
 use reth_node_builder::{NodeTypesWithDBAdapter, NodeTypesWithEngine};
 use reth_node_core::{

diff --git a/crates/cli/commands/src/db/get.rs b/crates/cli/commands/src/db/get.rs
@@ -1,13 +1,13 @@
 use alloy_consensus::Header;
 use alloy_primitives::{hex, BlockHash};
 use clap::Parser;
-use reth_db::{
-    static_file::{
-        ColumnSelectorOne, ColumnSelectorTwo, HeaderWithHashMask, ReceiptMask, TransactionMask,
-    },
+use reth_db::static_file::{
+    ColumnSelectorOne, ColumnSelectorTwo, HeaderWithHashMask, ReceiptMask, TransactionMask,
+};
+use reth_db_api::{
+    table::{Decompress, DupSort, Table},
     tables, RawKey, RawTable, Receipts, TableViewer, Transactions,
 };
-use reth_db_api::table::{Decompress, DupSort, Table};
 use reth_db_common::DbTool;
 use reth_node_api::{ReceiptTy, TxTy};
 use reth_node_builder::NodeTypesWithDB;
@@ -207,8 +207,10 @@ mod tests {
     use super::*;
     use alloy_primitives::{Address, B256};
     use clap::{Args, Parser};
-    use reth_db::{AccountsHistory, HashedAccounts, Headers, StageCheckpoints, StoragesHistory};
-    use reth_db_api::models::{storage_sharded_key::StorageShardedKey, ShardedKey};
+    use reth_db_api::{
+        models::{storage_sharded_key::StorageShardedKey, ShardedKey},
+        AccountsHistory, HashedAccounts, Headers, StageCheckpoints, StoragesHistory,
+    };
     use std::str::FromStr;
 
     /// A helper type to parse Args more easily

diff --git a/crates/cli/commands/src/db/list.rs b/crates/cli/commands/src/db/list.rs
@@ -3,8 +3,8 @@ use alloy_primitives::hex;
 use clap::Parser;
 use eyre::WrapErr;
 use reth_chainspec::EthereumHardforks;
-use reth_db::{DatabaseEnv, RawValue, TableViewer, Tables};
-use reth_db_api::{database::Database, table::Table};
+use reth_db::DatabaseEnv;
+use reth_db_api::{database::Database, table::Table, RawValue, TableViewer, Tables};
 use reth_db_common::{DbTool, ListFilter};
 use reth_node_builder::{NodeTypesWithDBAdapter, NodeTypesWithEngine};
 use std::{cell::RefCell, sync::Arc};

diff --git a/crates/cli/commands/src/db/stats.rs b/crates/cli/commands/src/db/stats.rs
@@ -5,8 +5,8 @@ use eyre::WrapErr;
 use human_bytes::human_bytes;
 use itertools::Itertools;
 use reth_chainspec::EthereumHardforks;
-use reth_db::{mdbx, static_file::iter_static_files, DatabaseEnv, TableViewer, Tables};
-use reth_db_api::database::Database;
+use reth_db::{mdbx, static_file::iter_static_files, DatabaseEnv};
+use reth_db_api::{database::Database, TableViewer, Tables};
 use reth_db_common::DbTool;
 use reth_fs_util as fs;
 use reth_node_builder::{NodePrimitives, NodeTypesWithDB, NodeTypesWithDBAdapter};

diff --git a/crates/cli/commands/src/db/tui.rs b/crates/cli/commands/src/db/tui.rs
@@ -10,8 +10,10 @@ use ratatui::{
     widgets::{Block, Borders, List, ListItem, ListState, Paragraph, Wrap},
     Frame, Terminal,
 };
-use reth_db::RawValue;
-use reth_db_api::table::{Table, TableRow};
+use reth_db_api::{
+    table::{Table, TableRow},
+    RawValue,
+};
 use std::{
     io,
     time::{Duration, Instant},

diff --git a/crates/cli/commands/src/import.rs b/crates/cli/commands/src/import.rs
@@ -7,8 +7,7 @@ use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_cli::chainspec::ChainSpecParser;
 use reth_config::Config;
 use reth_consensus::{ConsensusError, FullConsensus};
-use reth_db::tables;
-use reth_db_api::transaction::DbTx;
+use reth_db_api::{tables, transaction::DbTx};
 use reth_downloaders::{
     bodies::bodies::BodiesDownloaderBuilder,
     file_client::{ChunkedFileReader, FileClient, DEFAULT_BYTE_LEN_CHUNK_CHAIN_FILE},

diff --git a/crates/cli/commands/src/recover/storage_tries.rs b/crates/cli/commands/src/recover/storage_tries.rs
@@ -4,9 +4,9 @@ use clap::Parser;
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_cli::chainspec::ChainSpecParser;
 use reth_cli_runner::CliContext;
-use reth_db::tables;
 use reth_db_api::{
     cursor::{DbCursorRO, DbDupCursorRW},
+    tables,
     transaction::DbTx,
 };
 use reth_provider::{BlockNumReader, HeaderProvider, ProviderError};

diff --git a/crates/cli/commands/src/stage/drop.rs b/crates/cli/commands/src/stage/drop.rs
@@ -4,8 +4,11 @@ use clap::Parser;
 use itertools::Itertools;
 use reth_chainspec::EthChainSpec;
 use reth_cli::chainspec::ChainSpecParser;
-use reth_db::{mdbx::tx::Tx, static_file::iter_static_files, tables, DatabaseError};
-use reth_db_api::transaction::{DbTx, DbTxMut};
+use reth_db::{mdbx::tx::Tx, static_file::iter_static_files, DatabaseError};
+use reth_db_api::{
+    tables,
+    transaction::{DbTx, DbTxMut},
+};
 use reth_db_common::{
     init::{insert_genesis_header, insert_genesis_history, insert_genesis_state},
     DbTool,

diff --git a/crates/cli/commands/src/stage/dump/execution.rs b/crates/cli/commands/src/stage/dump/execution.rs
@@ -1,10 +1,8 @@
-use std::sync::Arc;
-
 use super::setup;
 use reth_consensus::{noop::NoopConsensus, ConsensusError, FullConsensus};
-use reth_db::{tables, DatabaseEnv};
+use reth_db::DatabaseEnv;
 use reth_db_api::{
-    cursor::DbCursorRO, database::Database, table::TableImporter, transaction::DbTx,
+    cursor::DbCursorRO, database::Database, table::TableImporter, tables, transaction::DbTx,
 };
 use reth_db_common::DbTool;
 use reth_evm::{execute::BlockExecutorProvider, noop::NoopBlockExecutorProvider};
@@ -15,6 +13,7 @@ use reth_provider::{
     DatabaseProviderFactory, ProviderFactory,
 };
 use reth_stages::{stages::ExecutionStage, Stage, StageCheckpoint, UnwindInput};
+use std::sync::Arc;
 use tracing::info;
 
 pub(crate) async fn dump_execution_stage<N, E, C>(

diff --git a/crates/cli/commands/src/stage/dump/hashing_account.rs b/crates/cli/commands/src/stage/dump/hashing_account.rs
@@ -1,17 +1,16 @@
-use std::sync::Arc;
-
 use super::setup;
 use alloy_primitives::BlockNumber;
 use eyre::Result;
-use reth_db::{tables, DatabaseEnv};
-use reth_db_api::{database::Database, table::TableImporter};
+use reth_db::DatabaseEnv;
+use reth_db_api::{database::Database, table::TableImporter, tables};
 use reth_db_common::DbTool;
 use reth_node_core::dirs::{ChainPath, DataDirPath};
 use reth_provider::{
     providers::{ProviderNodeTypes, StaticFileProvider},
     DatabaseProviderFactory, ProviderFactory,
 };
 use reth_stages::{stages::AccountHashingStage, Stage, StageCheckpoint, UnwindInput};
+use std::sync::Arc;
 use tracing::info;
 
 pub(crate) async fn dump_hashing_account_stage<N: ProviderNodeTypes<DB = Arc<DatabaseEnv>>>(

diff --git a/crates/cli/commands/src/stage/dump/hashing_storage.rs b/crates/cli/commands/src/stage/dump/hashing_storage.rs
@@ -1,16 +1,15 @@
-use std::sync::Arc;
-
 use super::setup;
 use eyre::Result;
-use reth_db::{tables, DatabaseEnv};
-use reth_db_api::{database::Database, table::TableImporter};
+use reth_db::DatabaseEnv;
+use reth_db_api::{database::Database, table::TableImporter, tables};
 use reth_db_common::DbTool;
 use reth_node_core::dirs::{ChainPath, DataDirPath};
 use reth_provider::{
     providers::{ProviderNodeTypes, StaticFileProvider},
     DatabaseProviderFactory, ProviderFactory,
 };
 use reth_stages::{stages::StorageHashingStage, Stage, StageCheckpoint, UnwindInput};
+use std::sync::Arc;
 use tracing::info;
 
 pub(crate) async fn dump_hashing_storage_stage<N: ProviderNodeTypes<DB = Arc<DatabaseEnv>>>(

diff --git a/crates/cli/commands/src/stage/dump/merkle.rs b/crates/cli/commands/src/stage/dump/merkle.rs
@@ -5,8 +5,8 @@ use alloy_primitives::BlockNumber;
 use eyre::Result;
 use reth_config::config::EtlConfig;
 use reth_consensus::noop::NoopConsensus;
-use reth_db::{tables, DatabaseEnv};
-use reth_db_api::{database::Database, table::TableImporter};
+use reth_db::DatabaseEnv;
+use reth_db_api::{database::Database, table::TableImporter, tables};
 use reth_db_common::DbTool;
 use reth_evm::noop::NoopBlockExecutorProvider;
 use reth_exex::ExExManagerHandle;

diff --git a/crates/cli/commands/src/stage/dump/mod.rs b/crates/cli/commands/src/stage/dump/mod.rs
@@ -3,9 +3,9 @@ use crate::common::{AccessRights, CliNodeComponents, CliNodeTypes, Environment,
 use clap::Parser;
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_cli::chainspec::ChainSpecParser;
-use reth_db::{init_db, mdbx::DatabaseArguments, tables, DatabaseEnv};
+use reth_db::{init_db, mdbx::DatabaseArguments, DatabaseEnv};
 use reth_db_api::{
-    cursor::DbCursorRO, database::Database, models::ClientVersion, table::TableImporter,
+    cursor::DbCursorRO, database::Database, models::ClientVersion, table::TableImporter, tables,
     transaction::DbTx,
 };
 use reth_db_common::DbTool;

diff --git a/crates/cli/commands/src/test_vectors/tables.rs b/crates/cli/commands/src/test_vectors/tables.rs
@@ -8,8 +8,10 @@ use proptest::{
     test_runner::{TestRng, TestRunner},
 };
 use proptest_arbitrary_interop::arb;
-use reth_db::tables;
-use reth_db_api::table::{DupSort, Table, TableRow};
+use reth_db_api::{
+    table::{DupSort, Table, TableRow},
+    tables,
+};
 use reth_fs_util as fs;
 use reth_primitives::TransactionSigned;
 use std::collections::HashSet;

diff --git a/crates/engine/tree/src/tree/trie_updates.rs b/crates/engine/tree/src/tree/trie_updates.rs
@@ -1,12 +1,11 @@
-use std::collections::BTreeSet;
-
 use alloy_primitives::{map::HashMap, B256};
 use reth_db::DatabaseError;
 use reth_trie::{
     trie_cursor::{TrieCursor, TrieCursorFactory},
     updates::{StorageTrieUpdates, TrieUpdates},
     BranchNodeCompact, Nibbles,
 };
+use std::collections::BTreeSet;
 use tracing::warn;
 
 #[derive(Debug)]

diff --git a/crates/net/downloaders/src/bodies/test_utils.rs b/crates/net/downloaders/src/bodies/test_utils.rs
@@ -4,8 +4,8 @@
 
 use alloy_consensus::BlockHeader;
 use alloy_primitives::B256;
-use reth_db::{tables, DatabaseEnv};
-use reth_db_api::{database::Database, transaction::DbTxMut};
+use reth_db::DatabaseEnv;
+use reth_db_api::{database::Database, tables, transaction::DbTxMut};
 use reth_network_p2p::bodies::response::BlockResponse;
 use reth_primitives::{BlockBody, SealedBlock, SealedHeader};
 use reth_primitives_traits::Block;

diff --git a/crates/optimism/cli/src/commands/import.rs b/crates/optimism/cli/src/commands/import.rs
@@ -7,8 +7,7 @@ use reth_cli_commands::{
     import::build_import_pipeline,
 };
 use reth_consensus::noop::NoopConsensus;
-use reth_db::tables;
-use reth_db_api::transaction::DbTx;
+use reth_db_api::{tables, transaction::DbTx};
 use reth_downloaders::file_client::{ChunkedFileReader, DEFAULT_BYTE_LEN_CHUNK_CHAIN_FILE};
 use reth_node_builder::BlockTy;
 use reth_node_core::version::SHORT_VERSION;

diff --git a/crates/optimism/cli/src/commands/import_receipts.rs b/crates/optimism/cli/src/commands/import_receipts.rs
@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 use clap::Parser;
 use reth_cli::chainspec::ChainSpecParser;
 use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
-use reth_db::tables;
+use reth_db_api::tables;
 use reth_downloaders::{
     file_client::{ChunkedFileReader, DEFAULT_BYTE_LEN_CHUNK_CHAIN_FILE},
     receipt_file_client::ReceiptFileClient,

diff --git a/crates/prune/prune/Cargo.toml b/crates/prune/prune/Cargo.toml
@@ -15,7 +15,6 @@ workspace = true
 # reth
 reth-chainspec.workspace = true
 reth-exex-types.workspace = true
-reth-db.workspace = true
 reth-db-api.workspace = true
 reth-errors.workspace = true
 reth-provider.workspace = true

diff --git a/crates/prune/prune/src/builder.rs b/crates/prune/prune/src/builder.rs
@@ -2,7 +2,7 @@ use crate::{segments::SegmentSet, Pruner};
 use alloy_eips::eip2718::Encodable2718;
 use reth_chainspec::MAINNET;
 use reth_config::PruneConfig;
-use reth_db::{table::Value, transaction::DbTxMut};
+use reth_db_api::{table::Value, transaction::DbTxMut};
 use reth_exex_types::FinishedExExHeight;
 use reth_primitives_traits::NodePrimitives;
 use reth_provider::{

diff --git a/crates/prune/prune/src/db_ext.rs b/crates/prune/prune/src/db_ext.rs
@@ -1,12 +1,11 @@
-use std::{fmt::Debug, ops::RangeBounds};
-
 use crate::PruneLimiter;
-use reth_db::{
+use reth_db_api::{
     cursor::{DbCursorRO, DbCursorRW, RangeWalker},
     table::{Table, TableRow},
     transaction::DbTxMut,
     DatabaseError,
 };
+use std::{fmt::Debug, ops::RangeBounds};
 use tracing::debug;
 
 pub(crate) trait DbTxPruneExt: DbTxMut {

diff --git a/crates/prune/prune/src/error.rs b/crates/prune/prune/src/error.rs
@@ -1,5 +1,4 @@
-use reth_db::DatabaseError;
-use reth_errors::RethError;
+use reth_errors::{DatabaseError, RethError};
 use reth_provider::ProviderError;
 use reth_prune_types::PruneSegmentError;
 use thiserror::Error;

diff --git a/crates/prune/prune/src/segments/receipts.rs b/crates/prune/prune/src/segments/receipts.rs
@@ -6,7 +6,7 @@
 //!   node after static file producer has finished
 
 use crate::{db_ext::DbTxPruneExt, segments::PruneInput, PrunerError};
-use reth_db::{table::Value, tables, transaction::DbTxMut};
+use reth_db_api::{table::Value, tables, transaction::DbTxMut};
 use reth_primitives_traits::NodePrimitives;
 use reth_provider::{
     errors::provider::ProviderResult, BlockReader, DBProvider, NodePrimitivesProvider,
@@ -88,7 +88,7 @@ mod tests {
         FoldWhile::{Continue, Done},
         Itertools,
     };
-    use reth_db::tables;
+    use reth_db_api::tables;
     use reth_provider::{DatabaseProviderFactory, PruneCheckpointReader};
     use reth_prune_types::{
         PruneCheckpoint, PruneInterruptReason, PruneMode, PruneProgress, PruneSegment,