From 3eb9738a61ea3b0725a76b0fc93b818050d0f0f5 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Thu, 27 Feb 2020 12:14:24 +0100 Subject: [PATCH] get nbench compiling again --- beacon_chain.nimble | 1 + nbench/nbench.nim | 3 ++- nbench/scenarios.nim | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/beacon_chain.nimble b/beacon_chain.nimble index 248c663ef..af3435134 100644 --- a/beacon_chain.nimble +++ b/beacon_chain.nimble @@ -13,6 +13,7 @@ skipDirs = @["nfuzz"] bin = @[ "beacon_chain/beacon_node", "research/serialized_sizes", + "nbench/nbench", ] ### Dependencies diff --git a/nbench/nbench.nim b/nbench/nbench.nim index 86bfc7821..92489e510 100644 --- a/nbench/nbench.nim +++ b/nbench/nbench.nim @@ -70,8 +70,9 @@ proc main() = runProcessAttesterSlashing( scenario.scenarioDir.string, scenario.preState, - "attester_slashing" # Pending https://github.com/status-im/nim-confutils/issues/11 + "attester_slashing", # Pending https://github.com/status-im/nim-confutils/issues/11 # scenario.attesterSlashing + scenario.skipBLS ) of catAttestations: runProcessAttestation( diff --git a/nbench/scenarios.nim b/nbench/scenarios.nim index 3f5bd4e8c..855ea8c31 100644 --- a/nbench/scenarios.nim +++ b/nbench/scenarios.nim @@ -131,7 +131,7 @@ proc parseSSZ(path: string, T: typedesc): T = stderr.write "SSZ load issue for file \"", path, "\"\n" stderr.write err.formatMsg(path), "\n" quit 1 - except CatchableError as err: + except CatchableError: writeStackTrace() stderr.write "SSZ load issue for file \"", path, "\"\n" quit 1 @@ -219,7 +219,7 @@ template processBlockScenarioImpl( elif needFlags: let success = transitionFn(state[], consObj[], flags) elif needCache: - let success = transitionFn(state[], consObj[], cache) + let success = transitionFn(state[], consObj[], flags, cache) else: let success = transitionFn(state[], consObj[]) @@ -242,6 +242,6 @@ genProcessEpochScenario(runProcessFinalUpdates, process_final_updates, needCache genProcessBlockScenario(runProcessBlockHeader, process_block_header, block_header, BeaconBlock, needFlags = true, needCache = true) genProcessBlockScenario(runProcessProposerSlashing, process_proposer_slashing, proposer_slashing, ProposerSlashing, needFlags = true, needCache = true) genProcessBlockScenario(runProcessAttestation, process_attestation, attestation, Attestation, needFlags = true, needCache = true) -genProcessBlockScenario(runProcessAttesterSlashing, process_attester_slashing, att_slash, AttesterSlashing, needFlags = false, needCache = true) +genProcessBlockScenario(runProcessAttesterSlashing, process_attester_slashing, att_slash, AttesterSlashing, needFlags = true, needCache = true) genProcessBlockScenario(runProcessDeposit, process_deposit, deposit, Deposit, needFlags = true, needCache = false) genProcessBlockScenario(runProcessVoluntaryExits, process_voluntary_exit, deposit, SignedVoluntaryExit, needFlags = true, needCache = false)