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

Rename Merge to Bellatrix (#5601)

Browse Source 
* Rename Merge to Bellatrix

* Remove tree-hash-cache which got readded from the rebase
This commit is contained in:
Mac L
2024-04-26 06:19:41 +10:00
committed by GitHub
parent 320345695d
commit 13f94ef0f3
104 changed files with 808 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ pub async fn handle_rpc<E: EthSpec>(
.get_fork_at_timestamp(*request.timestamp());
// validate method called correctly according to fork time
match fork {
ForkName::Merge => {
ForkName::Bellatrix => {
if matches!(request, JsonExecutionPayload::V2(_)) {
return Err((
format!(
@@ -395,7 +395,7 @@ pub async fn handle_rpc<E: EthSpec>(
.read()
.get_fork_at_timestamp(*pa.timestamp())
{
ForkName::Merge => {
ForkName::Bellatrix => {
get_param::<Option<JsonPayloadAttributesV1>>(params, 1)
.map(|opt| opt.map(JsonPayloadAttributes::V1))
.transpose()
@@ -427,7 +427,7 @@ pub async fn handle_rpc<E: EthSpec>(
.read()
.get_fork_at_timestamp(*pa.timestamp())
{
ForkName::Merge => {
ForkName::Bellatrix => {
if matches!(pa, JsonPayloadAttributes::V2(_)) {
return Err((
format!(