primitives: rm more alloy_primitives reexports (#11325)

This commit is contained in:
Thomas Coratger
2024-09-30 03:06:47 +02:00
committed by GitHub
parent ea1d04aa75
commit e21d75f9aa
53 changed files with 114 additions and 136 deletions

View File

@ -1,5 +1,5 @@
#![allow(unreachable_pub)]
use alloy_primitives::{Address, B256, U256};
use alloy_primitives::{Address, Sealable, B256, U256};
use itertools::concat;
use reth_chainspec::ChainSpec;
use reth_db::{tables, test_utils::TempDatabase, Database, DatabaseEnv};
@ -7,7 +7,7 @@ use reth_db_api::{
cursor::DbCursorRO,
transaction::{DbTx, DbTxMut},
};
use reth_primitives::{alloy_primitives::Sealable, Account, SealedBlock, SealedHeader};
use reth_primitives::{Account, SealedBlock, SealedHeader};
use reth_provider::{DatabaseProvider, DatabaseProviderFactory, TrieWriter};
use reth_stages::{
stages::{AccountHashingStage, StorageHashingStage},

View File

@ -1,5 +1,5 @@
use crate::stages::MERKLE_STAGE_DEFAULT_CLEAN_THRESHOLD;
use alloy_primitives::BlockNumber;
use alloy_primitives::{BlockNumber, Sealable};
use num_traits::Zero;
use reth_config::config::ExecutionConfig;
use reth_db::{static_file::HeaderMask, tables};
@ -10,7 +10,7 @@ use reth_evm::{
};
use reth_execution_types::{Chain, ExecutionOutcome};
use reth_exex::{ExExManagerHandle, ExExNotification};
use reth_primitives::{alloy_primitives::Sealable, Header, SealedHeader, StaticFileSegment};
use reth_primitives::{Header, SealedHeader, StaticFileSegment};
use reth_primitives_traits::format_gas_throughput;
use reth_provider::{
providers::{StaticFileProvider, StaticFileProviderRWRefMut, StaticFileWriter},

View File

@ -378,12 +378,10 @@ mod tests {
use crate::test_utils::{
stage_test_suite, ExecuteStageTestRunner, StageTestRunner, UnwindStageTestRunner,
};
use alloy_primitives::B256;
use alloy_primitives::{Sealable, B256};
use assert_matches::assert_matches;
use reth_execution_types::ExecutionOutcome;
use reth_primitives::{
alloy_primitives::Sealable, BlockBody, SealedBlock, SealedBlockWithSenders,
};
use reth_primitives::{BlockBody, SealedBlock, SealedBlockWithSenders};
use reth_provider::{BlockWriter, ProviderFactory, StaticFileProviderFactory};
use reth_stages_api::StageUnitCheckpoint;
use reth_testing_utils::generators::{self, random_header, random_header_range};

View File

@ -1,9 +1,9 @@
use alloy_primitives::{BlockNumber, B256};
use alloy_primitives::{BlockNumber, Sealable, B256};
use reth_codecs::Compact;
use reth_consensus::ConsensusError;
use reth_db::tables;
use reth_db_api::transaction::{DbTx, DbTxMut};
use reth_primitives::{alloy_primitives::Sealable, GotExpected, SealedHeader};
use reth_primitives::{GotExpected, SealedHeader};
use reth_provider::{
DBProvider, HeaderProvider, ProviderError, StageCheckpointReader, StageCheckpointWriter,
StatsReader, TrieWriter,

View File

@ -1,4 +1,4 @@
use alloy_primitives::{keccak256, Address, BlockNumber, TxNumber, B256, U256};
use alloy_primitives::{keccak256, Address, BlockNumber, TxHash, TxNumber, B256, U256};
use reth_chainspec::MAINNET;
use reth_db::{
tables,
@ -15,7 +15,7 @@ use reth_db_api::{
DatabaseError as DbError,
};
use reth_primitives::{
Account, Receipt, SealedBlock, SealedHeader, StaticFileSegment, StorageEntry, TxHash,
Account, Receipt, SealedBlock, SealedHeader, StaticFileSegment, StorageEntry,
};
use reth_provider::{
providers::{StaticFileProvider, StaticFileProviderRWRefMut, StaticFileWriter},