Clean ups

This commit is contained in:
Jimmy Chen
2026-04-27 12:01:23 +02:00
parent 1543db8b87
commit 0e9107f0be
2 changed files with 19 additions and 29 deletions

View File

@@ -140,11 +140,6 @@ struct RejectedAggregate<E: EthSpec> {
error: AttnError,
}
struct RejectedPayloadAttestation {
payload_attestation_message: Box<PayloadAttestationMessage>,
error: PayloadAttestationError,
}
/// Data for an aggregated or unaggregated attestation that failed verification.
enum FailedAtt<E: EthSpec> {
Unaggregate {
@@ -4111,25 +4106,20 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
peer_id: PeerId,
payload_attestation_message: Box<PayloadAttestationMessage>,
) {
let result = match self
let message_slot = payload_attestation_message.data.slot;
let result = self
.chain
.verify_payload_attestation_message_for_gossip(*payload_attestation_message.clone())
{
Ok(verified) => Ok(verified),
Err(error) => Err(RejectedPayloadAttestation {
payload_attestation_message: payload_attestation_message.clone(),
error,
}),
};
.verify_payload_attestation_message_for_gossip(*payload_attestation_message);
self.process_gossip_payload_attestation_result(result, message_id, peer_id);
self.process_gossip_payload_attestation_result(result, message_id, peer_id, message_slot);
}
fn process_gossip_payload_attestation_result(
self: &Arc<Self>,
result: Result<VerifiedPayloadAttestationMessage<T>, RejectedPayloadAttestation>,
result: Result<VerifiedPayloadAttestationMessage<T>, PayloadAttestationError>,
message_id: MessageId,
peer_id: PeerId,
message_slot: Slot,
) {
match result {
Ok(verified) => {
@@ -4165,15 +4155,12 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
);
}
}
Err(RejectedPayloadAttestation {
payload_attestation_message,
error,
}) => {
Err(error) => {
self.handle_payload_attestation_verification_failure(
peer_id,
message_id,
error,
payload_attestation_message.data.slot,
message_slot,
);
}
}