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

get nbench compiling again

This commit is contained in:
Dustin Brody 2020-02-27 12:14:24 +01:00 committed by tersec
parent 532fac69f3
commit 3eb9738a61
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
beacon_chain.nimble
View File

@ -13,6 +13,7 @@ skipDirs = @["nfuzz"]
bin = @[ bin = @[
"beacon_chain/beacon_node", "beacon_chain/beacon_node",
"research/serialized_sizes", "research/serialized_sizes",
"nbench/nbench",
] ]
### Dependencies ### Dependencies

3
nbench/nbench.nim
View File

@ -70,8 +70,9 @@ proc main() =
runProcessAttesterSlashing( runProcessAttesterSlashing(
scenario.scenarioDir.string, scenario.scenarioDir.string,
scenario.preState, 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.attesterSlashing
scenario.skipBLS
) )
of catAttestations: of catAttestations:
runProcessAttestation( runProcessAttestation(

6
nbench/scenarios.nim
View File

@ -131,7 +131,7 @@ proc parseSSZ(path: string, T: typedesc): T =
stderr.write "SSZ load issue for file \"", path, "\"\n" stderr.write "SSZ load issue for file \"", path, "\"\n"
stderr.write err.formatMsg(path), "\n" stderr.write err.formatMsg(path), "\n"
quit 1 quit 1
except CatchableError as err: except CatchableError:
writeStackTrace() writeStackTrace()
stderr.write "SSZ load issue for file \"", path, "\"\n" stderr.write "SSZ load issue for file \"", path, "\"\n"
quit 1 quit 1
@ -219,7 +219,7 @@ template processBlockScenarioImpl(
elif needFlags: elif needFlags:
let success = transitionFn(state[], consObj[], flags) let success = transitionFn(state[], consObj[], flags)
elif needCache: elif needCache:
let success = transitionFn(state[], consObj[], cache) let success = transitionFn(state[], consObj[], flags, cache)
else: else:
let success = transitionFn(state[], consObj[]) 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(runProcessBlockHeader, process_block_header, block_header, BeaconBlock, needFlags = true, needCache = true)
genProcessBlockScenario(runProcessProposerSlashing, process_proposer_slashing, proposer_slashing, ProposerSlashing, 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(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(runProcessDeposit, process_deposit, deposit, Deposit, needFlags = true, needCache = false)
genProcessBlockScenario(runProcessVoluntaryExits, process_voluntary_exit, deposit, SignedVoluntaryExit, needFlags = true, needCache = false) genProcessBlockScenario(runProcessVoluntaryExits, process_voluntary_exit, deposit, SignedVoluntaryExit, needFlags = true, needCache = false)