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

fix UnnamedBreak deprecation build warnings (#6388)

This commit is contained in:
tersec 2024-06-26 08:48:49 +00:00 committed by GitHub
parent 2d4ece0c3b
commit 288540e794
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_chain/consensus_object_pools/spec_cache.nim
View File

@ -123,21 +123,21 @@ iterator get_attesting_indices*(shufflingRef: ShufflingRef,
iterator get_attesting_indices*( iterator get_attesting_indices*(
dag: ChainDAGRef, attestation: phase0.TrustedAttestation, dag: ChainDAGRef, attestation: phase0.TrustedAttestation,
on_chain: static bool = true): ValidatorIndex = on_chain: static bool = true): ValidatorIndex =
block: # `return` is not allowed in an inline iterator block gaiBlock: # `return` is not allowed in an inline iterator
let let
slot = slot =
check_attestation_slot_target(attestation.data).valueOr: check_attestation_slot_target(attestation.data).valueOr:
warn "Invalid attestation slot in trusted attestation", warn "Invalid attestation slot in trusted attestation",
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
blck = blck =
dag.getBlockRef(attestation.data.beacon_block_root).valueOr: dag.getBlockRef(attestation.data.beacon_block_root).valueOr:
# Attestation block unknown - this is fairly common because we # Attestation block unknown - this is fairly common because we
# discard alternative histories on restart # discard alternative histories on restart
debug "Pruned block in trusted attestation", debug "Pruned block in trusted attestation",
attestation = shortLog(attestation) attestation = shortLog(attestation)
break break gaiBlock
target = target =
blck.atCheckpoint(attestation.data.target).valueOr: blck.atCheckpoint(attestation.data.target).valueOr:
# This may happen when there's no block at the epoch boundary slot # This may happen when there's no block at the epoch boundary slot
@ -148,7 +148,7 @@ iterator get_attesting_indices*(
blck = shortLog(blck), blck = shortLog(blck),
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
shufflingRef = shufflingRef =
dag.getShufflingRef(target.blck, target.slot.epoch, false).valueOr: dag.getShufflingRef(target.blck, target.slot.epoch, false).valueOr:
warn "Attestation shuffling not found", warn "Attestation shuffling not found",
@ -156,7 +156,7 @@ iterator get_attesting_indices*(
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
committeesPerSlot = get_committee_count_per_slot(shufflingRef) committeesPerSlot = get_committee_count_per_slot(shufflingRef)
committeeIndex = committeeIndex =
@ -166,7 +166,7 @@ iterator get_attesting_indices*(
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
for validator in get_attesting_indices( for validator in get_attesting_indices(
shufflingRef, slot, committeeIndex, attestation.aggregation_bits): shufflingRef, slot, committeeIndex, attestation.aggregation_bits):
@ -175,21 +175,21 @@ iterator get_attesting_indices*(
iterator get_attesting_indices*( iterator get_attesting_indices*(
dag: ChainDAGRef, attestation: electra.TrustedAttestation, dag: ChainDAGRef, attestation: electra.TrustedAttestation,
on_chain: static bool): ValidatorIndex = on_chain: static bool): ValidatorIndex =
block: # `return` is not allowed in an inline iterator block gaiBlock: # `return` is not allowed in an inline iterator
let let
slot = slot =
check_attestation_slot_target(attestation.data).valueOr: check_attestation_slot_target(attestation.data).valueOr:
warn "Invalid attestation slot in trusted attestation", warn "Invalid attestation slot in trusted attestation",
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
blck = blck =
dag.getBlockRef(attestation.data.beacon_block_root).valueOr: dag.getBlockRef(attestation.data.beacon_block_root).valueOr:
# Attestation block unknown - this is fairly common because we # Attestation block unknown - this is fairly common because we
# discard alternative histories on restart # discard alternative histories on restart
debug "Pruned block in trusted attestation", debug "Pruned block in trusted attestation",
attestation = shortLog(attestation) attestation = shortLog(attestation)
break break gaiBlock
target = target =
blck.atCheckpoint(attestation.data.target).valueOr: blck.atCheckpoint(attestation.data.target).valueOr:
# This may happen when there's no block at the epoch boundary slot # This may happen when there's no block at the epoch boundary slot
@ -200,7 +200,7 @@ iterator get_attesting_indices*(
blck = shortLog(blck), blck = shortLog(blck),
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
shufflingRef = shufflingRef =
dag.getShufflingRef(target.blck, target.slot.epoch, false).valueOr: dag.getShufflingRef(target.blck, target.slot.epoch, false).valueOr:
warn "Attestation shuffling not found", warn "Attestation shuffling not found",
@ -208,7 +208,7 @@ iterator get_attesting_indices*(
attestation = shortLog(attestation) attestation = shortLog(attestation)
doAssert strictVerification notin dag.updateFlags doAssert strictVerification notin dag.updateFlags
break break gaiBlock
for validator in get_attesting_indices( for validator in get_attesting_indices(
shufflingRef, slot, attestation.committee_bits, shufflingRef, slot, attestation.committee_bits,