Merge conflicts

This commit is contained in:
Eitan Seri-Levi
2026-04-30 09:48:04 +02:00
86 changed files with 2835 additions and 1038 deletions

View File

@@ -8994,7 +8994,7 @@ async fn create_signed_inclusion_lists() {
config.spec.deneb_fork_epoch = Some(Epoch::new(0));
config.spec.electra_fork_epoch = Some(Epoch::new(0));
config.spec.fulu_fork_epoch = Some(Epoch::new(0));
config.spec.eip7805_fork_epoch = Some(Epoch::new(0));
config.spec.heze_fork_epoch = Some(Epoch::new(0));
ApiTester::new_from_config(config)
.await
.test_create_inclusion_lists()
@@ -9010,7 +9010,7 @@ async fn test_post_validator_duties_inclusion_list() {
config.spec.deneb_fork_epoch = Some(Epoch::new(0));
config.spec.electra_fork_epoch = Some(Epoch::new(0));
config.spec.fulu_fork_epoch = Some(Epoch::new(0));
config.spec.eip7805_fork_epoch = Some(Epoch::new(0));
config.spec.heze_fork_epoch = Some(Epoch::new(0));
ApiTester::new_from_config(config)
.await
.test_post_validator_duties_inclusion_list()