mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 04:37:13 +00:00
Merge conflicts
This commit is contained in:
@@ -385,6 +385,7 @@ pub async fn proposer_boost_re_org_weight_misprediction() {
|
||||
/// - `num_empty_votes`: percentage of comm of attestations for the parent block
|
||||
/// - `num_head_votes`: number of attestations for the head block
|
||||
/// - `should_re_org`: whether the proposer should build on the parent rather than the head
|
||||
#[allow(clippy::large_stack_frames)]
|
||||
pub async fn proposer_boost_re_org_test(
|
||||
ReOrgTest {
|
||||
head_slot,
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user