gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-09 11:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation issues after merge

Browse Source
This commit is contained in:
realbigsean
2023-02-07 12:33:29 -05:00
parent 26a296246d
commit a42d07592c
8 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,8 @@ pub async fn handle_rpc<T: EthSpec>(
get_param::<JsonExecutionPayloadV1<T>>(params, 0)
.map(|jep| JsonExecutionPayload::V1(jep))
})
})?,
})
.map_err(|s| (s, BAD_PARAMS_ERROR_CODE))?,
_ => unreachable!(),
};
@@ -150,18 +151,27 @@ pub async fn handle_rpc<T: EthSpec>(
}
ForkName::Eip4844 => {
if method == ENGINE_NEW_PAYLOAD_V1 || method == ENGINE_NEW_PAYLOAD_V2 {
return Err((format!("{} called after capella fork!", method), GENERIC_ERROR_CODE));
return Err((
format!("{} called after capella fork!", method),
GENERIC_ERROR_CODE,
));
}
if matches!(request, JsonExecutionPayload::V1(_)) {
return Err((format!(
"{} called with `ExecutionPayloadV1` after eip4844 fork!",
method
), GENERIC_ERROR_CODE));
return Err((
format!(
"{} called with `ExecutionPayloadV1` after eip4844 fork!",
method
),
GENERIC_ERROR_CODE,
));
}
if matches!(request, JsonExecutionPayload::V2(_)) {
return Err((format!(
"{} called with `ExecutionPayloadV2` after eip4844 fork!",
method), GENERIC_ERROR_CODE
return Err((
format!(
"{} called with `ExecutionPayloadV2` after eip4844 fork!",
method
),
GENERIC_ERROR_CODE,
));
}
}
@@ -235,7 +245,10 @@ pub async fn handle_rpc<T: EthSpec>(
== ForkName::Eip4844
&& (method == ENGINE_GET_PAYLOAD_V1 || method == ENGINE_GET_PAYLOAD_V2)
{
return Err((format!("{} called after eip4844 fork!", method), FORK_REQUEST_MISMATCH_ERROR_CODE));
return Err((
format!("{} called after eip4844 fork!", method),
FORK_REQUEST_MISMATCH_ERROR_CODE,
));
}
match method {
@@ -263,23 +276,23 @@ pub async fn handle_rpc<T: EthSpec>(
JsonExecutionPayload::V1(execution_payload) => {
serde_json::to_value(JsonGetPayloadResponseV1 {
execution_payload,
block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into()
block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into(),
})
.unwrap()
.unwrap()
}
JsonExecutionPayload::V2(execution_payload) => {
serde_json::to_value(JsonGetPayloadResponseV2 {
execution_payload,
block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into()
block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into(),
})
.unwrap()
.unwrap()
}
JsonExecutionPayload::V3(execution_payload) => {
serde_json::to_value(JsonGetPayloadResponseV3 {
execution_payload,
block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into()
block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into(),
})
.unwrap()
.unwrap()
}
}),
_ => unreachable!(),

2
beacon_node/execution_layer/src/test_utils/mod.rs
View File

@@ -37,10 +37,12 @@ pub const DEFAULT_BUILDER_PAYLOAD_VALUE_WEI: u128 = 20_000_000_000_000_000;
pub const DEFAULT_ENGINE_CAPABILITIES: EngineCapabilities = EngineCapabilities {
new_payload_v1: true,
new_payload_v2: true,
new_payload_v3: true,
forkchoice_updated_v1: true,
forkchoice_updated_v2: true,
get_payload_v1: true,
get_payload_v2: true,
get_payload_v3: true,
exchange_transition_configuration_v1: true,
};