primitives: rm alloy Header reexport (#12515)

This commit is contained in:
Thomas Coratger
2024-11-13 17:41:25 +01:00
committed by GitHub
parent e6f3191c62
commit 001f3899fd
134 changed files with 493 additions and 439 deletions

View File

@ -26,6 +26,7 @@ reth-trie-common.workspace = true
# ethereum
alloy-primitives.workspace = true
alloy-consensus.workspace = true
# mdbx
reth-libmdbx = { workspace = true, optional = true, features = [
@ -90,31 +91,29 @@ mdbx = [
"dep:rustc-hash",
]
test-utils = [
"dep:tempfile",
"arbitrary",
"parking_lot",
"reth-primitives/test-utils",
"reth-primitives-traits/test-utils",
"reth-db-api/test-utils",
"reth-nippy-jar/test-utils",
"reth-trie-common/test-utils",
"reth-prune-types/test-utils",
"reth-stages-types/test-utils"
"dep:tempfile",
"arbitrary",
"parking_lot",
"reth-primitives/test-utils",
"reth-primitives-traits/test-utils",
"reth-db-api/test-utils",
"reth-nippy-jar/test-utils",
"reth-trie-common/test-utils",
"reth-prune-types/test-utils",
"reth-stages-types/test-utils",
]
bench = []
arbitrary = [
"reth-primitives/arbitrary",
"reth-db-api/arbitrary",
"reth-primitives-traits/arbitrary",
"reth-trie-common/arbitrary",
"alloy-primitives/arbitrary",
"reth-prune-types/arbitrary",
"reth-stages-types/arbitrary"
]
optimism = [
"reth-primitives/optimism",
"reth-db-api/optimism"
"reth-primitives/arbitrary",
"reth-db-api/arbitrary",
"reth-primitives-traits/arbitrary",
"reth-trie-common/arbitrary",
"alloy-primitives/arbitrary",
"reth-prune-types/arbitrary",
"reth-stages-types/arbitrary",
"alloy-consensus/arbitrary",
]
optimism = ["reth-primitives/optimism", "reth-db-api/optimism"]
disable-lock = []
[[bench]]

View File

@ -497,6 +497,7 @@ mod tests {
test_utils::*,
AccountChangeSets,
};
use alloy_consensus::Header;
use alloy_primitives::{Address, B256, U256};
use reth_db_api::{
cursor::{DbDupCursorRO, DbDupCursorRW, ReverseWalker, Walker},
@ -504,7 +505,7 @@ mod tests {
table::{Encode, Table},
};
use reth_libmdbx::Error;
use reth_primitives::{Account, Header, StorageEntry};
use reth_primitives::{Account, StorageEntry};
use reth_primitives_traits::IntegerList;
use reth_storage_errors::db::{DatabaseWriteError, DatabaseWriteOperation};
use std::str::FromStr;

View File

@ -4,9 +4,9 @@ use crate::{
static_file::mask::{ColumnSelectorOne, ColumnSelectorTwo, HeaderMask},
HeaderTerminalDifficulties, RawValue, Receipts, Transactions,
};
use alloy_consensus::Header;
use alloy_primitives::BlockHash;
use reth_db_api::table::Table;
use reth_primitives::Header;
// HEADER MASKS
add_static_file_mask!(HeaderMask, Header, 0b001);

View File

@ -19,6 +19,7 @@ pub use raw::{RawDupSort, RawKey, RawTable, RawValue, TableRawRow};
#[cfg(feature = "mdbx")]
pub(crate) mod utils;
use alloy_consensus::Header;
use alloy_primitives::{Address, BlockHash, BlockNumber, TxHash, TxNumber, B256};
use reth_db_api::{
models::{
@ -30,7 +31,7 @@ use reth_db_api::{
},
table::{Decode, DupSort, Encode, Table},
};
use reth_primitives::{Account, Bytecode, Header, Receipt, StorageEntry, TransactionSignedNoHash};
use reth_primitives::{Account, Bytecode, Receipt, StorageEntry, TransactionSignedNoHash};
use reth_primitives_traits::IntegerList;
use reth_prune_types::{PruneCheckpoint, PruneSegment};
use reth_stages_types::StageCheckpoint;