status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use errReject template everywhere 

There were still a few instances that used the expansion of `errReject`
instead of using the template itself. It seems that those cases were
forgotten as part of other cleanups in #2809. Done now for readability.
This commit is contained in:
Etan Kissling 2021-09-27 10:38:36 +02:00 committed by zah
parent 6aff2cd19a
commit 4743807079
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_chain/gossip_processing/gossip_validation.nim
View File

@ -158,7 +158,7 @@ template checkedReject(msg: cstring): untyped =
# an internal consistency/correctness check only, and effectively never has # an internal consistency/correctness check only, and effectively never has
# false positives. These don't, for example, arise from timeouts. # false positives. These don't, for example, arise from timeouts.
raiseAssert $msg raiseAssert $msg
err((ValidationResult.Reject, cstring msg)) errReject(msg)
template checkedReject(error: (ValidationResult, cstring)): untyped = template checkedReject(error: (ValidationResult, cstring)): untyped =
doAssert error[0] == ValidationResult.Reject doAssert error[0] == ValidationResult.Reject
@ -860,8 +860,7 @@ proc validateSignedContributionAndProof*(
# [REJECT] contribution_and_proof.selection_proof selects the validator as an aggregator for the slot # [REJECT] contribution_and_proof.selection_proof selects the validator as an aggregator for the slot
# i.e. is_sync_committee_aggregator(contribution_and_proof.selection_proof) returns True. # i.e. is_sync_committee_aggregator(contribution_and_proof.selection_proof) returns True.
if not is_sync_committee_aggregator(msg.message.selection_proof): if not is_sync_committee_aggregator(msg.message.selection_proof):
return err((ValidationResult.Reject, cstring( return errReject("SignedContributionAndProof: invalid selection_proof")
"SignedContributionAndProof: invalid selection_proof")))
block: block:
# [IGNORE] The sync committee contribution is the first valid contribution # [IGNORE] The sync committee contribution is the first valid contribution