remove nbench (#3152)

Used during initial development of the spec, `nbench` has fallen behind
and by and large been superceded by `block_sim`, `state_sim` and
`ncli_db bench`.

Author: arnetheduck

Makefile

@@ -43,8 +43,6 @@ TOOLS := \
 	deposit_contract \
 	resttest \
 	logtrace \
-	nbench \
-	nbench_spec_scenarios \
 	ncli \
 	ncli_db \
 	stack_sizes \
@@ -59,7 +57,6 @@ TOOLS_DIRS := \
 	beacon_chain/eth1 \
 	benchmarks \
 	ncli \
-	nbench \
 	research \
 	tools
 TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))

beacon_chain/spec/beaconstate.nim

@@ -14,8 +14,7 @@ import
   chronicles,
   ../extras,
   ./datatypes/[phase0, altair, merge],
-  "."/[eth2_merkleization, forks, signatures, validator],
-  ../../nbench/bench_lab
+  "."/[eth2_merkleization, forks, signatures, validator]
 
 export extras, forks, validator
 
@@ -195,7 +194,7 @@ proc initialize_beacon_state_from_eth1*(
     eth1_block_hash: Eth2Digest,
     eth1_timestamp: uint64,
     deposits: openArray[DepositData],
-    flags: UpdateFlags = {}): phase0.BeaconState {.nbench.} =
+    flags: UpdateFlags = {}): phase0.BeaconState =
   ## Get the genesis ``BeaconState``.
   ##
   ## Before the beacon chain starts, validators will register in the Eth1 chain
@@ -627,7 +626,7 @@ proc check_attestation*(
 proc process_attestation*(
     state: var ForkyBeaconState, attestation: SomeAttestation, flags: UpdateFlags,
     base_reward_per_increment: Gwei, cache: var StateCache):
-    Result[void, cstring] {.nbench.} =
+    Result[void, cstring] =
   # In the spec, attestation validation is mixed with state mutation, so here
   # we've split it into two functions so that the validation logic can be
   # reused when looking for suitable blocks to include in attestations.

beacon_chain/spec/state_transition.nim

@@ -49,18 +49,17 @@ import
   ./datatypes/[phase0, altair, merge],
   "."/[
     beaconstate, eth2_merkleization, forks, helpers, signatures,
-    state_transition_block, state_transition_epoch, validator],
-  ../../nbench/bench_lab
+    state_transition_block, state_transition_epoch, validator]
 
 export extras, phase0, altair
 
 type Foo = phase0.SignedBeaconBlock | altair.SignedBeaconBlock | phase0.TrustedSignedBeaconBlock | altair.TrustedSignedBeaconBlock | phase0.SigVerifiedSignedBeaconBlock | altair.SigVerifiedSignedBeaconBlock | merge.TrustedSignedBeaconBlock | merge.SigVerifiedSignedBeaconBlock | merge.SignedBeaconBlock
 
 # https://github.com/ethereum/consensus-specs/blob/v1.1.5/specs/phase0/beacon-chain.md#beacon-chain-state-transition-function
 proc verify_block_signature(
-    #state: ForkyBeaconState, signed_block: SomeSomeSignedBeaconBlock): bool {.nbench.} =
-    state: ForkyBeaconState, signed_block: Foo): bool {.nbench.} =
-    #state: ForkyBeaconState, signed_block: phase0.SomeSignedBeaconBlock | altair.SomeSignedBeaconBlock): bool {.nbench.} =
+    #state: ForkyBeaconState, signed_block: SomeSomeSignedBeaconBlock): bool =
+    state: ForkyBeaconState, signed_block: Foo): bool =
+    #state: ForkyBeaconState, signed_block: phase0.SomeSignedBeaconBlock | altair.SomeSignedBeaconBlock): bool =
   let
     proposer_index = signed_block.message.proposer_index
   if proposer_index >= state.validators.lenu64:
@@ -135,7 +134,7 @@ type
 
 # https://github.com/ethereum/consensus-specs/blob/v1.1.5/specs/phase0/beacon-chain.md#beacon-chain-state-transition-function
 func process_slot*(
-    state: var ForkyBeaconState, pre_state_root: Eth2Digest) {.nbench.} =
+    state: var ForkyBeaconState, pre_state_root: Eth2Digest) =
   # `process_slot` is the first stage of per-slot processing - it is run for
   # every slot, including epoch slots - it does not however update the slot
   # number! `pre_state_root` refers to the state root of the incoming
@@ -165,7 +164,7 @@ func clear_epoch_from_cache(cache: var StateCache, epoch: Epoch) =
 proc advance_slot(
     cfg: RuntimeConfig,
     state: var ForkyBeaconState, previous_slot_state_root: Eth2Digest,
-    flags: UpdateFlags, cache: var StateCache, info: var ForkyEpochInfo) {.nbench.} =
+    flags: UpdateFlags, cache: var StateCache, info: var ForkyEpochInfo) =
   # Do the per-slot and potentially the per-epoch processing, then bump the
   # slot number - we've now arrived at the slot state on top of which a block
   # optionally can be applied.
@@ -221,7 +220,7 @@ proc maybeUpgradeState*(
 
 proc process_slots*(
     cfg: RuntimeConfig, state: var ForkedHashedBeaconState, slot: Slot,
-    cache: var StateCache, info: var ForkedEpochInfo, flags: UpdateFlags): bool {.nbench.} =
+    cache: var StateCache, info: var ForkedEpochInfo, flags: UpdateFlags): bool =
   if not (getStateField(state, slot) < slot):
     if slotProcessed notin flags or getStateField(state, slot) != slot:
       notice "Unusual request for a slot in the past",
@@ -255,7 +254,7 @@ proc state_transition_block_aux(
                  altair.SigVerifiedSignedBeaconBlock | altair.TrustedSignedBeaconBlock |
                  merge.TrustedSignedBeaconBlock | merge.SigVerifiedSignedBeaconBlock |
                  merge.SignedBeaconBlock,
-    cache: var StateCache, flags: UpdateFlags): bool {.nbench.} =
+    cache: var StateCache, flags: UpdateFlags): bool =
   # Block updates - these happen when there's a new block being suggested
   # by the block proposer. Every actor in the network will update its state
   # according to the contents of this block - but first they will validate
@@ -307,7 +306,7 @@ proc state_transition_block*(
                  altair.TrustedSignedBeaconBlock | merge.TrustedSignedBeaconBlock |
                  merge.SigVerifiedSignedBeaconBlock | merge.SignedBeaconBlock,
     cache: var StateCache, flags: UpdateFlags,
-    rollback: RollbackForkedHashedProc): bool {.nbench.} =
+    rollback: RollbackForkedHashedProc): bool =
   ## `rollback` is called if the transition fails and the given state has been
   ## partially changed. If a temporary state was given to `state_transition`,
   ## it is safe to use `noRollback` and leave it broken, else the state
@@ -335,7 +334,7 @@ proc state_transition*(
                  altair.TrustedSignedBeaconBlock | merge.TrustedSignedBeaconBlock |
                  merge.SignedBeaconBlock,
     cache: var StateCache, info: var ForkedEpochInfo, flags: UpdateFlags,
-    rollback: RollbackForkedHashedProc): bool {.nbench.} =
+    rollback: RollbackForkedHashedProc): bool =
   ## Apply a block to the state, advancing the slot counter as necessary. The
   ## given state must be of a lower slot, or, in case the `slotProcessed` flag
   ## is set, can be the slot state of the same slot as the block (where the

beacon_chain/spec/state_transition_block.nim

@@ -24,15 +24,14 @@ import
   chronicles, metrics,
   ../extras,
   ./datatypes/[phase0, altair, merge],
-  "."/[beaconstate, eth2_merkleization, helpers, validator, signatures],
-  ../../nbench/bench_lab
+  "."/[beaconstate, eth2_merkleization, helpers, validator, signatures]
 
 export extras, phase0, altair
 
 # https://github.com/ethereum/consensus-specs/blob/v1.1.5/specs/phase0/beacon-chain.md#block-header
 func process_block_header*(
     state: var ForkyBeaconState, blck: SomeSomeBeaconBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.} =
+    cache: var StateCache): Result[void, cstring] =
   # Verify that the slots match
   if not (blck.slot == state.slot):
     return err("process_block_header: slot mismatch")
@@ -75,7 +74,7 @@ func `xor`[T: array](a, b: T): T =
 # https://github.com/ethereum/consensus-specs/blob/v1.1.5/specs/phase0/beacon-chain.md#randao
 proc process_randao(
     state: var ForkyBeaconState, body: SomeSomeBeaconBlockBody, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.} =
+    cache: var StateCache): Result[void, cstring] =
   let
     proposer_index = get_beacon_proposer_index(state, cache)
 
@@ -106,7 +105,7 @@ proc process_randao(
   ok()
 
 # https://github.com/ethereum/consensus-specs/blob/v1.1.5/specs/phase0/beacon-chain.md#eth1-data
-func process_eth1_data(state: var ForkyBeaconState, body: SomeSomeBeaconBlockBody): Result[void, cstring] {.nbench.}=
+func process_eth1_data(state: var ForkyBeaconState, body: SomeSomeBeaconBlockBody): Result[void, cstring]=
   if not state.eth1_data_votes.add body.eth1_data:
     # Count is reset  in process_final_updates, so this should never happen
     return err("process_eth1_data: no more room for eth1 data")
@@ -127,7 +126,7 @@ func is_slashable_validator(validator: Validator, epoch: Epoch): bool =
 proc check_proposer_slashing*(
     state: var ForkyBeaconState, proposer_slashing: SomeProposerSlashing,
     flags: UpdateFlags):
-    Result[void, cstring] {.nbench.} =
+    Result[void, cstring] =
 
   let
     header_1 = proposer_slashing.signed_header_1.message
@@ -177,7 +176,7 @@ proc process_proposer_slashing*(
     cfg: RuntimeConfig, state: var ForkyBeaconState,
     proposer_slashing: SomeProposerSlashing, flags: UpdateFlags,
     cache: var StateCache):
-    Result[void, cstring] {.nbench.} =
+    Result[void, cstring] =
   ? check_proposer_slashing(state, proposer_slashing, flags)
   slash_validator(
     cfg, state,
@@ -202,7 +201,7 @@ proc check_attester_slashing*(
        state: var ForkyBeaconState,
        attester_slashing: SomeAttesterSlashing,
        flags: UpdateFlags
-     ): Result[seq[ValidatorIndex], cstring] {.nbench.} =
+     ): Result[seq[ValidatorIndex], cstring] =
   let
     attestation_1 = attester_slashing.attestation_1
     attestation_2 = attester_slashing.attestation_2
@@ -244,7 +243,7 @@ proc process_attester_slashing*(
     attester_slashing: SomeAttesterSlashing,
     flags: UpdateFlags,
     cache: var StateCache
-    ): Result[void, cstring] {.nbench.} =
+    ): Result[void, cstring] =
   let attester_slashing_validity =
     check_attester_slashing(state, attester_slashing, flags)
 
@@ -259,7 +258,7 @@ proc process_attester_slashing*(
 proc process_deposit*(cfg: RuntimeConfig,
                       state: var ForkyBeaconState,
                       deposit: Deposit,
-                      flags: UpdateFlags): Result[void, cstring] {.nbench.} =
+                      flags: UpdateFlags): Result[void, cstring] =
   ## Process an Eth1 deposit, registering a validator or increasing its balance.
 
   # Verify the Merkle branch
@@ -328,7 +327,7 @@ proc check_voluntary_exit*(
     cfg: RuntimeConfig,
     state: ForkyBeaconState,
     signed_voluntary_exit: SomeSignedVoluntaryExit,
-    flags: UpdateFlags): Result[void, cstring] {.nbench.} =
+    flags: UpdateFlags): Result[void, cstring] =
 
   let voluntary_exit = signed_voluntary_exit.message
 
@@ -389,7 +388,7 @@ proc process_voluntary_exit*(
     state: var ForkyBeaconState,
     signed_voluntary_exit: SomeSignedVoluntaryExit,
     flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.} =
+    cache: var StateCache): Result[void, cstring] =
   ? check_voluntary_exit(cfg, state, signed_voluntary_exit, flags)
   initiate_validator_exit(
     cfg, state, signed_voluntary_exit.message.validator_index.ValidatorIndex,
@@ -402,7 +401,7 @@ proc process_operations(cfg: RuntimeConfig,
                         body: SomeSomeBeaconBlockBody,
                         base_reward_per_increment: Gwei,
                         flags: UpdateFlags,
-                        cache: var StateCache): Result[void, cstring] {.nbench.} =
+                        cache: var StateCache): Result[void, cstring] =
   # Verify that outstanding deposits are processed up to the maximum number of
   # deposits
   let
@@ -430,7 +429,7 @@ proc process_operations(cfg: RuntimeConfig,
 proc process_sync_aggregate*(
     state: var (altair.BeaconState | merge.BeaconState),
     aggregate: SomeSyncAggregate, total_active_balance: Gwei, cache: var StateCache):
-    Result[void, cstring] {.nbench.} =
+    Result[void, cstring] =
   # Verify sync committee aggregate signature signing over the previous slot
   # block root
   let
@@ -491,7 +490,7 @@ proc process_sync_aggregate*(
 # https://github.com/ethereum/consensus-specs/blob/v1.1.4/specs/merge/beacon-chain.md#process_execution_payload
 proc process_execution_payload*(
     state: var merge.BeaconState, payload: ExecutionPayload,
-    execute_payload: ExecutePayload): Result[void, cstring] {.nbench.} =
+    execute_payload: ExecutePayload): Result[void, cstring] =
   ## Verify consistency of the parent hash with respect to the previous
   ## execution payload header
   if is_merge_complete(state):
@@ -537,7 +536,7 @@ type SomePhase0Block =
 proc process_block*(
     cfg: RuntimeConfig,
     state: var phase0.BeaconState, blck: SomePhase0Block, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   ## When there's a new block, we need to verify that the block is sane and
   ## update the state accordingly - the state is left in an unknown state when
   ## block application fails (!)
@@ -552,13 +551,13 @@ proc process_block*(
 proc process_block*(
     cfg: RuntimeConfig,
     state: var altair.BeaconState, blck: SomePhase0Block, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.} =
+    cache: var StateCache): Result[void, cstring] =
   err("process_block: Altair state with Phase 0 block")
 
 proc process_block*(
     cfg: RuntimeConfig,
     state: var merge.BeaconState, blck: SomePhase0Block, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.} =
+    cache: var StateCache): Result[void, cstring] =
   err("process_block: Merge state with Phase 0 block")
 
 # https://github.com/ethereum/consensus-specs/blob/v1.1.5/specs/altair/beacon-chain.md#block-processing
@@ -569,7 +568,7 @@ type SomeAltairBlock =
 proc process_block*(
     cfg: RuntimeConfig,
     state: var altair.BeaconState, blck: SomeAltairBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   ## When there's a new block, we need to verify that the block is sane and
   ## update the state accordingly - the state is left in an unknown state when
   ## block application fails (!)
@@ -596,7 +595,7 @@ type SomeMergeBlock =
 proc process_block*(
     cfg: RuntimeConfig,
     state: var merge.BeaconState, blck: SomeMergeBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   ## When there's a new block, we need to verify that the block is sane and
   ## update the state accordingly - the state is left in an unknown state when
   ## block application fails (!)
@@ -624,23 +623,23 @@ proc process_block*(
 proc process_block*(
     cfg: RuntimeConfig,
     state: var phase0.BeaconState, blck: SomeAltairBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   err("process_block: Phase 0 state with Altair block")
 
 proc process_block*(
     cfg: RuntimeConfig,
     state: var phase0.BeaconState, blck: SomeMergeBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   err("process_block: Phase 0 state with Merge block")
 
 proc process_block*(
     cfg: RuntimeConfig,
     state: var altair.BeaconState, blck: SomeMergeBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   err("process_block: Altair state with Merge block")
 
 proc process_block*(
     cfg: RuntimeConfig,
     state: var merge.BeaconState, blck: SomeAltairBlock, flags: UpdateFlags,
-    cache: var StateCache): Result[void, cstring] {.nbench.}=
+    cache: var StateCache): Result[void, cstring]=
   err("process_block: Merge state with Altair block")