cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Kintsugi rebase patches (#2769)

Browse Source 
* Freshen Cargo.lock

* Fix gossip worker

* Update map_fork_name_with
This commit is contained in:
Paul Hauner 2021-11-03 18:37:23 +11:00
parent 6b4cc63b57
commit 86e0c56a38
No known key found for this signature in database
GPG Key ID: 5E2CFF9B75FA63DF
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
View File

@ -755,7 +755,7 @@ impl<T: BeaconChainTypes> Worker<T> {
debug!(self.log, "Could not verify block for gossip, ignoring the block"; debug!(self.log, "Could not verify block for gossip, ignoring the block";
"error" => %e); "error" => %e);
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore); self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
return; return None;
} }
Err(e @ BlockError::StateRootMismatch { .. }) Err(e @ BlockError::StateRootMismatch { .. })
| Err(e @ BlockError::IncorrectBlockProposer { .. }) | Err(e @ BlockError::IncorrectBlockProposer { .. })

4
consensus/types/src/fork_name.rs
View File

@ -97,6 +97,10 @@ macro_rules! map_fork_name_with {
let (value, extra_data) = $body; let (value, extra_data) = $body;
($t::Altair(value), extra_data) ($t::Altair(value), extra_data)
} }
ForkName::Merge => {
let (value, extra_data) = $body;
($t::Merge(value), extra_data)
}
} }
}; };
} }