separate nil error checks

prysmaticlabs · May 16, 2023 · 3dea7dc · 3dea7dc
1 parent a64a6f9
commit 3dea7dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/beacon-chain/operations/attestations/kv/aggregated.go b/beacon-chain/operations/attestations/kv/aggregated.go
@@ -54,9 +54,12 @@ func (c *AttCaches) aggregateUnaggregatedAttestations(ctx context.Context, unagg
 	leftOverUnaggregatedAtt := make(map[[32]byte]bool)
 	for _, atts := range attsByDataRoot {
 		aggregated, err := attaggregation.AggregateDisjointOneBitAtts(atts)
-		if err != nil || aggregated == nil {
+		if err != nil {
 			return errors.Wrap(err, "could not aggregate unaggregated attestations")
 		}
+		if aggregated == nil {
+			return errors.New("could not aggregate unaggregated attestations")
+		}
 		if helpers.IsAggregated(aggregated) {
 			if err := c.SaveAggregatedAttestations([]*ethpb.Attestation{aggregated}); err != nil {
 				return err

diff --git a/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations.go b/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations.go
@@ -64,9 +64,12 @@ func AggregateDisjointOneBitAtts(atts []*ethpb.Attestation) (*ethpb.Attestation,
 		keys[i] = i
 	}
 	idx, err := aggregateAttestations(atts, keys, coverage)
-	if err != nil || idx != 0 {
+	if err != nil {
 		return nil, errors.Wrap(err, "could not aggregate attestations")
 	}
+	if idx != 0 {
+		return nil, errors.New("could not aggregate attestations, obtained non zero index")
+	}
 	return atts[0], nil
 }