From 86e0c56a381de87fb3b0b2a902e4e732be917d33 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 3 Nov 2021 18:37:23 +1100 Subject: [PATCH] Kintsugi rebase patches (#2769) * Freshen Cargo.lock * Fix gossip worker * Update map_fork_name_with --- .../network/src/beacon_processor/worker/gossip_methods.rs | 2 +- consensus/types/src/fork_name.rs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs index e8acc129a..9e7270d4f 100644 --- a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs +++ b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs @@ -755,7 +755,7 @@ impl Worker { debug!(self.log, "Could not verify block for gossip, ignoring the block"; "error" => %e); self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore); - return; + return None; } Err(e @ BlockError::StateRootMismatch { .. }) | Err(e @ BlockError::IncorrectBlockProposer { .. }) diff --git a/consensus/types/src/fork_name.rs b/consensus/types/src/fork_name.rs index b877aac86..54cc7a245 100644 --- a/consensus/types/src/fork_name.rs +++ b/consensus/types/src/fork_name.rs @@ -97,6 +97,10 @@ macro_rules! map_fork_name_with { let (value, extra_data) = $body; ($t::Altair(value), extra_data) } + ForkName::Merge => { + let (value, extra_data) = $body; + ($t::Merge(value), extra_data) + } } }; }