From 10f3320782354c01600347851f520de44cb2a451 Mon Sep 17 00:00:00 2001 From: nk_ysg Date: Sat, 7 Sep 2024 17:12:16 +0800 Subject: [PATCH] storage: clean up reth-primitives import (#10761) --- Cargo.lock | 3 +++ crates/storage/db-common/Cargo.toml | 1 + crates/storage/db-common/src/init.rs | 5 ++--- crates/storage/errors/Cargo.toml | 6 +++++- crates/storage/errors/src/provider.rs | 6 ++---- crates/storage/storage-api/Cargo.toml | 3 +++ crates/storage/storage-api/src/account.rs | 3 ++- crates/storage/storage-api/src/block.rs | 5 +++-- crates/storage/storage-api/src/block_hash.rs | 3 ++- crates/storage/storage-api/src/block_id.rs | 3 ++- crates/storage/storage-api/src/header.rs | 3 ++- crates/storage/storage-api/src/noop.rs | 2 +- crates/storage/storage-api/src/receipts.rs | 5 ++--- crates/storage/storage-api/src/stage_checkpoint.rs | 2 +- crates/storage/storage-api/src/state.rs | 4 ++-- crates/storage/storage-api/src/storage.rs | 3 ++- crates/storage/storage-api/src/transactions.rs | 4 ++-- crates/storage/storage-api/src/trie.rs | 2 +- 18 files changed, 38 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ad70cf32..8b9ebdd67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6667,6 +6667,7 @@ name = "reth-db-common" version = "1.0.6" dependencies = [ "alloy-genesis", + "alloy-primitives", "boyer-moore-magiclen", "eyre", "reth-chainspec", @@ -8655,6 +8656,7 @@ dependencies = [ name = "reth-storage-api" version = "1.0.6" dependencies = [ + "alloy-primitives", "auto_impl", "reth-chainspec", "reth-db-models", @@ -8670,6 +8672,7 @@ dependencies = [ name = "reth-storage-errors" version = "1.0.6" dependencies = [ + "alloy-primitives", "alloy-rlp", "derive_more 1.0.0", "reth-fs-util", diff --git a/crates/storage/db-common/Cargo.toml b/crates/storage/db-common/Cargo.toml index f977d176a..7fc487969 100644 --- a/crates/storage/db-common/Cargo.toml +++ b/crates/storage/db-common/Cargo.toml @@ -25,6 +25,7 @@ reth-node-types.workspace = true # eth alloy-genesis.workspace = true +alloy-primitives.workspace = true # misc eyre.workspace = true diff --git a/crates/storage/db-common/src/init.rs b/crates/storage/db-common/src/init.rs index c40249561..43146db78 100644 --- a/crates/storage/db-common/src/init.rs +++ b/crates/storage/db-common/src/init.rs @@ -1,6 +1,7 @@ //! Reth genesis initialization utility functions. use alloy_genesis::GenesisAccount; +use alloy_primitives::{Address, B256, U256}; use reth_chainspec::ChainSpec; use reth_codecs::Compact; use reth_config::config::EtlConfig; @@ -8,9 +9,7 @@ use reth_db::tables; use reth_db_api::{database::Database, transaction::DbTxMut, DatabaseError}; use reth_etl::Collector; use reth_node_types::NodeTypesWithDB; -use reth_primitives::{ - Account, Address, Bytecode, Receipts, StaticFileSegment, StorageEntry, B256, U256, -}; +use reth_primitives::{Account, Bytecode, Receipts, StaticFileSegment, StorageEntry}; use reth_provider::{ errors::provider::ProviderResult, providers::{StaticFileProvider, StaticFileWriter}, diff --git a/crates/storage/errors/Cargo.toml b/crates/storage/errors/Cargo.toml index c93adfbe1..cbea35036 100644 --- a/crates/storage/errors/Cargo.toml +++ b/crates/storage/errors/Cargo.toml @@ -11,10 +11,14 @@ repository.workspace = true workspace = true [dependencies] -alloy-rlp.workspace = true +# reth reth-primitives.workspace = true reth-fs-util.workspace = true +# alloy +alloy-primitives.workspace = true +alloy-rlp.workspace = true + # misc derive_more.workspace = true diff --git a/crates/storage/errors/src/provider.rs b/crates/storage/errors/src/provider.rs index 16ff50f33..2f20f1ab8 100644 --- a/crates/storage/errors/src/provider.rs +++ b/crates/storage/errors/src/provider.rs @@ -1,9 +1,7 @@ use crate::{db::DatabaseError, lockfile::StorageLockError, writer::UnifiedStorageWriterError}; +use alloy_primitives::{Address, BlockHash, BlockNumber, TxNumber, B256, U256}; use derive_more::Display; -use reth_primitives::{ - Address, BlockHash, BlockHashOrNumber, BlockNumber, GotExpected, StaticFileSegment, - TxHashOrNumber, TxNumber, B256, U256, -}; +use reth_primitives::{BlockHashOrNumber, GotExpected, StaticFileSegment, TxHashOrNumber}; #[cfg(feature = "std")] use std::path::PathBuf; diff --git a/crates/storage/storage-api/Cargo.toml b/crates/storage/storage-api/Cargo.toml index 474ca93a7..e469cd6dc 100644 --- a/crates/storage/storage-api/Cargo.toml +++ b/crates/storage/storage-api/Cargo.toml @@ -22,4 +22,7 @@ reth-stages-types.workspace = true reth-storage-errors.workspace = true reth-trie.workspace = true +# alloy +alloy-primitives.workspace = true + auto_impl.workspace = true diff --git a/crates/storage/storage-api/src/account.rs b/crates/storage/storage-api/src/account.rs index 8f77894ec..e08298031 100644 --- a/crates/storage/storage-api/src/account.rs +++ b/crates/storage/storage-api/src/account.rs @@ -1,6 +1,7 @@ +use alloy_primitives::{Address, BlockNumber}; use auto_impl::auto_impl; use reth_db_models::AccountBeforeTx; -use reth_primitives::{Account, Address, BlockNumber}; +use reth_primitives::Account; use reth_storage_errors::provider::ProviderResult; use std::{ collections::{BTreeMap, BTreeSet}, diff --git a/crates/storage/storage-api/src/block.rs b/crates/storage/storage-api/src/block.rs index d6d0366a1..48ab5829d 100644 --- a/crates/storage/storage-api/src/block.rs +++ b/crates/storage/storage-api/src/block.rs @@ -2,10 +2,11 @@ use crate::{ BlockIdReader, BlockNumReader, HeaderProvider, ReceiptProvider, ReceiptProviderIdExt, RequestsProvider, TransactionVariant, TransactionsProvider, WithdrawalsProvider, }; +use alloy_primitives::{BlockNumber, B256}; use reth_db_models::StoredBlockBodyIndices; use reth_primitives::{ - Block, BlockHashOrNumber, BlockId, BlockNumber, BlockNumberOrTag, BlockWithSenders, Header, - Receipt, SealedBlock, SealedBlockWithSenders, SealedHeader, B256, + Block, BlockHashOrNumber, BlockId, BlockNumberOrTag, BlockWithSenders, Header, Receipt, + SealedBlock, SealedBlockWithSenders, SealedHeader, }; use reth_storage_errors::provider::ProviderResult; use std::ops::RangeInclusive; diff --git a/crates/storage/storage-api/src/block_hash.rs b/crates/storage/storage-api/src/block_hash.rs index bb6ff5a3a..84b8c2380 100644 --- a/crates/storage/storage-api/src/block_hash.rs +++ b/crates/storage/storage-api/src/block_hash.rs @@ -1,4 +1,5 @@ -use reth_primitives::{BlockHashOrNumber, BlockNumber, B256}; +use alloy_primitives::{BlockNumber, B256}; +use reth_primitives::BlockHashOrNumber; use reth_storage_errors::provider::ProviderResult; /// Client trait for fetching block hashes by number. diff --git a/crates/storage/storage-api/src/block_id.rs b/crates/storage/storage-api/src/block_id.rs index fbbf6fce5..b96da25ad 100644 --- a/crates/storage/storage-api/src/block_id.rs +++ b/crates/storage/storage-api/src/block_id.rs @@ -1,6 +1,7 @@ use crate::BlockHashReader; +use alloy_primitives::{BlockNumber, B256}; use reth_chainspec::ChainInfo; -use reth_primitives::{BlockHashOrNumber, BlockId, BlockNumber, BlockNumberOrTag, B256}; +use reth_primitives::{BlockHashOrNumber, BlockId, BlockNumberOrTag}; use reth_storage_errors::provider::{ProviderError, ProviderResult}; /// Client trait for getting important block numbers (such as the latest block number), converting diff --git a/crates/storage/storage-api/src/header.rs b/crates/storage/storage-api/src/header.rs index 433c90771..cd7e2a49f 100644 --- a/crates/storage/storage-api/src/header.rs +++ b/crates/storage/storage-api/src/header.rs @@ -1,4 +1,5 @@ -use reth_primitives::{BlockHash, BlockHashOrNumber, BlockNumber, Header, SealedHeader, U256}; +use alloy_primitives::{BlockHash, BlockNumber, U256}; +use reth_primitives::{BlockHashOrNumber, Header, SealedHeader}; use reth_storage_errors::provider::ProviderResult; use std::ops::RangeBounds; diff --git a/crates/storage/storage-api/src/noop.rs b/crates/storage/storage-api/src/noop.rs index a55371f3c..c3c33ac37 100644 --- a/crates/storage/storage-api/src/noop.rs +++ b/crates/storage/storage-api/src/noop.rs @@ -1,8 +1,8 @@ //! Various noop implementations for traits. use crate::{BlockHashReader, BlockNumReader}; +use alloy_primitives::{BlockNumber, B256}; use reth_chainspec::ChainInfo; -use reth_primitives::{BlockNumber, B256}; use reth_storage_errors::provider::ProviderResult; /// Supports various api interfaces for testing purposes. diff --git a/crates/storage/storage-api/src/receipts.rs b/crates/storage/storage-api/src/receipts.rs index ec28d8143..7329d728c 100644 --- a/crates/storage/storage-api/src/receipts.rs +++ b/crates/storage/storage-api/src/receipts.rs @@ -1,7 +1,6 @@ use crate::BlockIdReader; -use reth_primitives::{ - BlockHashOrNumber, BlockId, BlockNumber, BlockNumberOrTag, Receipt, TxHash, TxNumber, -}; +use alloy_primitives::{BlockNumber, TxHash, TxNumber}; +use reth_primitives::{BlockHashOrNumber, BlockId, BlockNumberOrTag, Receipt}; use reth_storage_errors::provider::ProviderResult; use std::ops::RangeBounds; diff --git a/crates/storage/storage-api/src/stage_checkpoint.rs b/crates/storage/storage-api/src/stage_checkpoint.rs index d59f3dfb2..90ad9eadb 100644 --- a/crates/storage/storage-api/src/stage_checkpoint.rs +++ b/crates/storage/storage-api/src/stage_checkpoint.rs @@ -1,4 +1,4 @@ -use reth_primitives::BlockNumber; +use alloy_primitives::BlockNumber; use reth_stages_types::{StageCheckpoint, StageId}; use reth_storage_errors::provider::ProviderResult; diff --git a/crates/storage/storage-api/src/state.rs b/crates/storage/storage-api/src/state.rs index 25da9ef4d..f1fc640e3 100644 --- a/crates/storage/storage-api/src/state.rs +++ b/crates/storage/storage-api/src/state.rs @@ -2,11 +2,11 @@ use super::{ AccountReader, BlockHashReader, BlockIdReader, StateProofProvider, StateRootProvider, StorageRootProvider, }; +use alloy_primitives::{Address, BlockHash, BlockNumber, B256, U256}; use auto_impl::auto_impl; use reth_execution_types::ExecutionOutcome; use reth_primitives::{ - Address, BlockHash, BlockId, BlockNumHash, BlockNumber, BlockNumberOrTag, Bytecode, StorageKey, - StorageValue, B256, KECCAK_EMPTY, U256, + BlockId, BlockNumHash, BlockNumberOrTag, Bytecode, StorageKey, StorageValue, KECCAK_EMPTY, }; use reth_storage_errors::provider::{ProviderError, ProviderResult}; diff --git a/crates/storage/storage-api/src/storage.rs b/crates/storage/storage-api/src/storage.rs index a45df9d72..91d0bc8c7 100644 --- a/crates/storage/storage-api/src/storage.rs +++ b/crates/storage/storage-api/src/storage.rs @@ -1,4 +1,5 @@ -use reth_primitives::{Address, BlockNumber, StorageEntry, B256}; +use alloy_primitives::{Address, BlockNumber, B256}; +use reth_primitives::StorageEntry; use reth_storage_errors::provider::ProviderResult; use std::{ collections::{BTreeMap, BTreeSet}, diff --git a/crates/storage/storage-api/src/transactions.rs b/crates/storage/storage-api/src/transactions.rs index 0553ef787..f21365b0d 100644 --- a/crates/storage/storage-api/src/transactions.rs +++ b/crates/storage/storage-api/src/transactions.rs @@ -1,7 +1,7 @@ use crate::{BlockNumReader, BlockReader}; +use alloy_primitives::{Address, BlockNumber, TxHash, TxNumber}; use reth_primitives::{ - Address, BlockHashOrNumber, BlockNumber, TransactionMeta, TransactionSigned, - TransactionSignedNoHash, TxHash, TxNumber, + BlockHashOrNumber, TransactionMeta, TransactionSigned, TransactionSignedNoHash, }; use reth_storage_errors::provider::{ProviderError, ProviderResult}; use std::ops::{Range, RangeBounds, RangeInclusive}; diff --git a/crates/storage/storage-api/src/trie.rs b/crates/storage/storage-api/src/trie.rs index 5be0b161b..d4a8c6aab 100644 --- a/crates/storage/storage-api/src/trie.rs +++ b/crates/storage/storage-api/src/trie.rs @@ -1,4 +1,4 @@ -use reth_primitives::{Address, Bytes, B256}; +use alloy_primitives::{Address, Bytes, B256}; use reth_storage_errors::provider::ProviderResult; use reth_trie::{ prefix_set::TriePrefixSetsMut, updates::TrieUpdates, AccountProof, HashedPostState,