Merge conflicts

2026-05-30 04:37:13 +00:00 · 2026-04-30 09:48:04 +02:00
parent bab71429f8 a3c91f6ecb
commit 027fdc1a68
86 changed files with 2835 additions and 1038 deletions
--- a/consensus/proto_array/src/fork_choice_test_definition.rs
+++ b/consensus/proto_array/src/fork_choice_test_definition.rs
@@ -1,6 +1,7 @@
 mod execution_status;
 mod ffg_updates;
 mod gloas_payload;
+mod heze_payload;
 mod no_votes;
 mod votes;

@@ -20,6 +21,7 @@ use types::{
 pub use execution_status::*;
 pub use ffg_updates::*;
 pub use gloas_payload::*;
+pub use heze_payload::*;
 pub use no_votes::*;
 pub use votes::*;

--- a/consensus/proto_array/src/fork_choice_test_definition/heze_payload.rs
+++ b/consensus/proto_array/src/fork_choice_test_definition/heze_payload.rs