diff --git a/consensus/types/src/core/chain_spec.rs b/consensus/types/src/core/chain_spec.rs index c9a4f3d9ab4..1bdf6c2cb86 100644 --- a/consensus/types/src/core/chain_spec.rs +++ b/consensus/types/src/core/chain_spec.rs @@ -14,10 +14,9 @@ use tree_hash::TreeHash; use crate::{ core::{ APPLICATION_DOMAIN_BUILDER, Address, ApplicationDomain, EnrForkId, Epoch, EthSpec, - EthSpecId, Hash256, MainnetEthSpec, Slot, Uint256, + EthSpecId, ExecutionBlockHash, Hash256, MainnetEthSpec, Slot, Uint256, }, data::{BlobIdentifier, DataColumnSubnetId, DataColumnsByRootIdentifier}, - execution::ExecutionBlockHash, fork::{Fork, ForkData, ForkName}, }; diff --git a/consensus/types/src/execution/execution_block_hash.rs b/consensus/types/src/core/execution_block_hash.rs similarity index 100% rename from consensus/types/src/execution/execution_block_hash.rs rename to consensus/types/src/core/execution_block_hash.rs diff --git a/consensus/types/src/core/mod.rs b/consensus/types/src/core/mod.rs index bb50bb18568..33d5856deaa 100644 --- a/consensus/types/src/core/mod.rs +++ b/consensus/types/src/core/mod.rs @@ -5,6 +5,7 @@ mod chain_spec; mod config_and_preset; mod enr_fork_id; mod eth_spec; +mod execution_block_hash; mod graffiti; mod non_zero_usize; mod preset; @@ -25,6 +26,7 @@ pub use config_and_preset::{ }; pub use enr_fork_id::EnrForkId; pub use eth_spec::{EthSpec, EthSpecId, GNOSIS, GnosisEthSpec, MainnetEthSpec, MinimalEthSpec}; +pub use execution_block_hash::ExecutionBlockHash; pub use graffiti::{GRAFFITI_BYTES_LEN, Graffiti, GraffitiString}; pub use non_zero_usize::new_non_zero_usize; pub use preset::{ diff --git a/consensus/types/src/execution/execution_payload.rs b/consensus/types/src/execution/execution_payload.rs index b2278c91667..d99b8785fa2 100644 --- a/consensus/types/src/execution/execution_payload.rs +++ b/consensus/types/src/execution/execution_payload.rs @@ -10,8 +10,7 @@ use test_random_derive::TestRandom; use tree_hash_derive::TreeHash; use crate::{ - core::{Address, EthSpec, Hash256}, - execution::ExecutionBlockHash, + core::{Address, EthSpec, ExecutionBlockHash, Hash256}, fork::{ForkName, ForkVersionDecode}, state::BeaconStateError, test_utils::TestRandom, diff --git a/consensus/types/src/execution/execution_payload_header.rs b/consensus/types/src/execution/execution_payload_header.rs index cf78f7871b4..0b8556634ae 100644 --- a/consensus/types/src/execution/execution_payload_header.rs +++ b/consensus/types/src/execution/execution_payload_header.rs @@ -11,11 +11,10 @@ use tree_hash::TreeHash; use tree_hash_derive::TreeHash; use crate::{ - core::{Address, EthSpec, Hash256, Uint256}, + core::{Address, EthSpec, ExecutionBlockHash, Hash256, Uint256}, execution::{ - ExecutionBlockHash, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadRef, - Transactions, + ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, + ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadRef, Transactions, }, fork::ForkName, map_execution_payload_ref_into_execution_payload_header, diff --git a/consensus/types/src/execution/mod.rs b/consensus/types/src/execution/mod.rs index da6c8606002..a3d4ed87301 100644 --- a/consensus/types/src/execution/mod.rs +++ b/consensus/types/src/execution/mod.rs @@ -1,5 +1,4 @@ mod eth1_data; -mod execution_block_hash; mod execution_block_header; #[macro_use] mod execution_payload; @@ -16,7 +15,6 @@ mod signed_execution_payload_envelope; pub use bls_to_execution_change::BlsToExecutionChange; pub use eth1_data::Eth1Data; -pub use execution_block_hash::ExecutionBlockHash; pub use execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader}; pub use execution_payload::{ ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, diff --git a/consensus/types/src/execution/payload.rs b/consensus/types/src/execution/payload.rs index 703b082c182..c51369034cd 100644 --- a/consensus/types/src/execution/payload.rs +++ b/consensus/types/src/execution/payload.rs @@ -11,9 +11,9 @@ use tree_hash::TreeHash; use tree_hash_derive::TreeHash; use crate::{ - core::{Address, EthSpec, Hash256}, + core::{Address, EthSpec, ExecutionBlockHash, Hash256}, execution::{ - ExecutionBlockHash, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, + ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu,