gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 04:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

linting

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-30 15:02:35 +02:00
parent 948da5e626
commit 79c855a1c4
33 changed files with 76 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
beacon_node/execution_layer/src/engine_api/http.rs
View File

@@ -1591,15 +1591,6 @@ impl HttpJsonRpc {
Err(Error::RequiredMethodUnsupported("engine_newPayloadV4"))
}
}
// TODO(HEZE) engine capabilties should be v5?
NewPayloadRequest::Heze(new_payload_request_heze) => {
if engine_capabilities.new_payload_v4 {
self.new_payload_v4_heze(new_payload_request_heze)
.await
} else {
Err(Error::RequiredMethodUnsupported("engine_newPayloadV4"))
}
}
NewPayloadRequest::Gloas(new_payload_request_gloas) => {
if engine_capabilities.new_payload_v5 {
self.new_payload_v5_gloas(new_payload_request_gloas).await
@@ -1649,13 +1640,6 @@ impl HttpJsonRpc {
Err(Error::RequiredMethodUnsupported("engine_getPayloadv4"))
}
}
ForkName::Heze => {
if engine_capabilities.get_payload_v4 {
self.get_payload_v4(fork_name, payload_id).await
} else {
Err(Error::RequiredMethodUnsupported("engine_getPayloadv4"))
}
}
ForkName::Fulu => {
if engine_capabilities.get_payload_v5 {
self.get_payload_v5(fork_name, payload_id).await
@@ -1663,14 +1647,7 @@ impl HttpJsonRpc {
Err(Error::RequiredMethodUnsupported("engine_getPayloadv5"))
}
}
ForkName::Gloas => {
if engine_capabilities.get_payload_v6 {
self.get_payload_v6(fork_name, payload_id).await
} else {
Err(Error::RequiredMethodUnsupported("engine_getPayloadV6"))
}
}
ForkName::Heze => {
ForkName::Gloas | ForkName::Heze => {
if engine_capabilities.get_payload_v6 {
self.get_payload_v6(fork_name, payload_id).await
} else {

2
beacon_node/execution_layer/src/engine_api/new_payload_request.rs
View File

@@ -185,7 +185,7 @@ impl<'block, E: EthSpec> NewPayloadRequest<'block, E> {
impl<'a, E: EthSpec> NewPayloadRequest<'a, E> {
pub fn try_from_block_and_il_transactions(
block: BeaconBlockRef<'a, E>,
il_transactions: Transactions<E>,
_il_transactions: Transactions<E>,
) -> Result<Self, BeaconStateError> {
match block {
BeaconBlockRef::Base(_) | BeaconBlockRef::Altair(_) => {

3
beacon_node/execution_layer/src/lib.rs
View File

@@ -1804,9 +1804,6 @@ impl<E: EthSpec> ExecutionLayer<E> {
ForkName::Gloas => {
return Err(Error::InvalidForkForPayload);
}
ForkName::Heze => {
return Err(Error::InvalidForkForPayload);
}
};
return Ok(Some(payload));
}

11
beacon_node/execution_layer/src/test_utils/execution_block_generator.rs
View File

@@ -1005,12 +1005,6 @@ pub fn generate_genesis_header<E: EthSpec>(spec: &ChainSpec) -> Option<Execution
*header.transactions_root_mut() = empty_transactions_root;
Some(header)
}
ForkName::Heze => {
let mut header = ExecutionPayloadHeader::Heze(<_>::default());
*header.block_hash_mut() = genesis_block_hash.unwrap_or_default();
*header.transactions_root_mut() = empty_transactions_root;
Some(header)
}
ForkName::Fulu => {
let mut header = ExecutionPayloadHeader::Fulu(<_>::default());
*header.block_hash_mut() = genesis_block_hash.unwrap_or_default();
@@ -1098,9 +1092,6 @@ mod test {
const DIFFICULTY_INCREMENT: u64 = 1;
let mut generator: ExecutionBlockGenerator<MainnetEthSpec> = ExecutionBlockGenerator::new(
Uint256::from(TERMINAL_DIFFICULTY),
TERMINAL_BLOCK,
ExecutionBlockHash::zero(),
None,
None,
None,
@@ -1109,6 +1100,8 @@ mod test {
None,
None,
);
generator.terminal_total_difficulty = Uint256::from(TERMINAL_DIFFICULTY);
generator.terminal_block_number = TERMINAL_BLOCK;
for i in 0..=TERMINAL_BLOCK {
if i > 0 {

32
beacon_node/execution_layer/src/test_utils/handle_rpc.rs
View File

@@ -238,22 +238,6 @@ pub async fn handle_rpc<E: EthSpec>(
));
}
}
ForkName::Gloas => {
if method != ENGINE_NEW_PAYLOAD_V5 {
return Err((
format!("{} called after Gloas fork!", method),
GENERIC_ERROR_CODE,
));
}
}
ForkName::Heze => {
if method != ENGINE_NEW_PAYLOAD_V5 {
return Err((
format!("{} called after Heze fork!", method),
GENERIC_ERROR_CODE,
));
}
}
_ => unreachable!(),
};
@@ -714,22 +698,6 @@ pub async fn handle_rpc<E: EthSpec>(
));
}
}
ForkName::Gloas => {
if method != ENGINE_FORKCHOICE_UPDATED_V4 {
return Err((
format!("{} called after Gloas fork! Use V4.", method),
FORK_REQUEST_MISMATCH_ERROR_CODE,
));
}
}
ForkName::Heze => {
if method != ENGINE_FORKCHOICE_UPDATED_V4 {
return Err((
format!("{} called after Heze fork! Use V4.", method),
FORK_REQUEST_MISMATCH_ERROR_CODE,
));
}
}
_ => unreachable!(),
};
}

14
beacon_node/execution_layer/src/test_utils/mock_builder.rs
View File

@@ -30,7 +30,7 @@ use tracing::{debug, error, info, warn};
use tree_hash::TreeHash;
use types::ExecutionBlockHash;
use types::builder::{
BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidHeze,
BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb,
BuilderBidElectra, BuilderBidFulu, SignedBuilderBid,
};
use types::{
@@ -638,18 +638,6 @@ impl<E: EthSpec> MockBuilder<E> {
pubkey: self.builder_sk.public_key().compress(),
execution_requests: maybe_requests.unwrap_or_default(),
}),
ForkName::Heze => BuilderBid::Heze(BuilderBidHeze {
header: payload
.as_heze()
.map_err(|_| "incorrect payload variant".to_string())?
.into(),
blob_kzg_commitments: maybe_blobs_bundle
.map(|b| b.commitments)
.unwrap_or_default(),
value: self.get_bid_value(value),
pubkey: self.builder_sk.public_key().compress(),
execution_requests: maybe_requests.unwrap_or_default(),
}),
ForkName::Electra => BuilderBid::Electra(BuilderBidElectra {
header: payload
.as_electra()