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

exception handling in `block_sim` (#5906) 

There were a few missing exception handlers in the `block_sim` dev tool.
Add them now, and also remove `strformat` dependency for modernization.
This commit is contained in:
Etan Kissling 2024-02-18 00:27:49 +01:00 committed by GitHub
parent 71444a371a
commit e7d2ee7cb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
research/block_sim.nim
View File

@ -5,6 +5,8 @@
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
{.push raises: [].}
# `block_sim` is a block, attestation, and sync committee simulator, whose task # `block_sim` is a block, attestation, and sync committee simulator, whose task
# is to run the beacon chain without considering the network or the wall clock. # is to run the beacon chain without considering the network or the wall clock.
# #
@ -26,7 +28,6 @@ import
from std/random import Rand, gauss, initRand, rand from std/random import Rand, gauss, initRand, rand
from std/stats import RunningStat from std/stats import RunningStat
from std/strformat import `&`
from ../beacon_chain/consensus_object_pools/attestation_pool import from ../beacon_chain/consensus_object_pools/attestation_pool import
AttestationPool, addAttestation, addForkChoice, getAttestationsForBlock, AttestationPool, addAttestation, addForkChoice, getAttestationsForBlock,
init, prune init, prune
@ -167,7 +168,11 @@ cli do(slots = SLOTS_PER_EPOCH * 7,
dag = ChainDAGRef.init(cfg, db, validatorMonitor, {}) dag = ChainDAGRef.init(cfg, db, validatorMonitor, {})
eth1Chain = Eth1Chain.init(cfg, db, 0, default Eth2Digest) eth1Chain = Eth1Chain.init(cfg, db, 0, default Eth2Digest)
merkleizer = DepositsMerkleizer.init(depositTreeSnapshot.depositContractState) merkleizer = DepositsMerkleizer.init(depositTreeSnapshot.depositContractState)
taskpool = Taskpool.new() taskpool =
try:
Taskpool.new()
except Exception as exc:
raiseAssert "Failed to initialize Taskpool: " & exc.msg
verifier = BatchVerifier.init(rng, taskpool) verifier = BatchVerifier.init(rng, taskpool)
quarantine = newClone(Quarantine.init()) quarantine = newClone(Quarantine.init())
attPool = AttestationPool.init(dag, quarantine) attPool = AttestationPool.init(dag, quarantine)
@ -252,7 +257,7 @@ cli do(slots = SLOTS_PER_EPOCH * 7,
validator_index: uint64 validatorIdx, validator_index: uint64 validatorIdx,
signature: signature.toValidatorSig) signature: signature.toValidatorSig)
let res = waitFor dag.validateSyncCommitteeMessage( let res = waitFor noCancel dag.validateSyncCommitteeMessage(
quarantine, quarantine,
batchCrypto, batchCrypto,
syncCommitteePool, syncCommitteePool,
@ -305,7 +310,7 @@ cli do(slots = SLOTS_PER_EPOCH * 7,
fork, genesis_validators_root, contributionAndProof, fork, genesis_validators_root, contributionAndProof,
validatorPrivKey).toValidatorSig) validatorPrivKey).toValidatorSig)
res = waitFor dag.validateContribution( res = waitFor noCancel dag.validateContribution(
quarantine, quarantine,
batchCrypto, batchCrypto,
syncCommitteePool, syncCommitteePool,
@ -485,10 +490,12 @@ cli do(slots = SLOTS_PER_EPOCH * 7,
verifyConsensus(dag.headState, attesterRatio * blockRatio) verifyConsensus(dag.headState, attesterRatio * blockRatio)
if t == tEpoch: if t == tEpoch:
echo &". slot: {shortLog(slot)} ", echo ". slot: ", shortLog(slot), "epoch: ", shortLog(slot.epoch)
&"epoch: {shortLog(slot.epoch)}"
else: else:
write(stdout, ".") try:
write(stdout, ".")
except IOError:
discard
flushFile(stdout) flushFile(stdout)
if replay: if replay: