Remove duplicated sig verification (#5676)

* Remove duplicated sig verification
prysmaticlabs · Apr 29, 2020 · 05fcb10 · 05fcb10
1 parent 81a7bc7
commit 05fcb10
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/beacon-chain/sync/validate_aggregate_proof.go b/beacon-chain/sync/validate_aggregate_proof.go
@@ -74,10 +74,6 @@ func (r *Service) validateAggregateAndProof(ctx context.Context, pid peer.ID, ms
 		return false
 	}
 
-	if !featureconfig.Get().DisableStrictAttestationPubsubVerification && !r.chain.IsValidAttestation(ctx, m.Message.Aggregate) {
-		return false
-	}
-
 	r.setAggregatorIndexSlotSeen(m.Message.Aggregate.Data.Slot, m.Message.AggregatorIndex)
 
 	msg.ValidatorData = m
@@ -129,9 +125,11 @@ func (r *Service) validateAggregatedAtt(ctx context.Context, signed *ethpb.Signe
 	}
 
 	// Verify aggregated attestation has a valid signature.
-	if err := blocks.VerifyAttestation(ctx, s, signed.Message.Aggregate); err != nil {
-		traceutil.AnnotateError(span, err)
-		return false
+	if !featureconfig.Get().DisableStrictAttestationPubsubVerification {
+		if err := blocks.VerifyAttestation(ctx, s, signed.Message.Aggregate); err != nil {
+			traceutil.AnnotateError(span, err)
+			return false
+		}
 	}
 
 	return true