mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 19:02:42 +00:00
fix merge
This commit is contained in:
@@ -351,12 +351,11 @@ impl CandidateBeaconNode {
|
||||
);
|
||||
} else if beacon_node_spec.fulu_fork_epoch != spec.fulu_fork_epoch {
|
||||
warn!(
|
||||
log,
|
||||
"Beacon node has mismatched Fulu fork epoch";
|
||||
"endpoint" => %self.beacon_node,
|
||||
"endpoint_fulu_fork_epoch" => ?beacon_node_spec.fulu_fork_epoch,
|
||||
"hint" => UPDATE_REQUIRED_LOG_HINT,
|
||||
);
|
||||
endpoint = %self.beacon_node,
|
||||
endpoint_fulu_fork_epoc = ?beacon_node_spec.fulu_fork_epoch,
|
||||
hint = UPDATE_REQUIRED_LOG_HINT,
|
||||
"Beacon node has mismatched Fulu fork epoch"
|
||||
);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
||||
@@ -457,12 +457,11 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> AttestationService<S,
|
||||
// This shouldn't happen unless BN and VC are out of sync with
|
||||
// respect to the Electra fork.
|
||||
error!(
|
||||
log,
|
||||
"Unable to convert to SingleAttestation";
|
||||
"error" => ?e,
|
||||
"committee_index" => attestation_data.index,
|
||||
"slot" => slot.as_u64(),
|
||||
"type" => "unaggregated",
|
||||
error = ?e,
|
||||
committee_index = attestation_data.index,
|
||||
slot = slot.as_u64(),
|
||||
"type" = "unaggregated",
|
||||
"Unable to convert to SingleAttestation",
|
||||
);
|
||||
None
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user