status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-22 11:18:25 +00:00
Code Issues Projects Releases Wiki Activity

remove redundant process_block overloads (#3541)

Browse Source
This commit is contained in:
Jacek Sieka 2022-03-23 13:49:54 +01:00 committed by GitHub
parent bc80ac3be1
commit bc4d4e1741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
beacon_chain/spec/state_transition_block.nim
View File

@ -558,18 +558,6 @@ proc process_block*(
ok() ok()
func process_block*(
cfg: RuntimeConfig,
state: var altair.BeaconState, blck: SomePhase0Block, flags: UpdateFlags,
cache: var StateCache): Result[void, cstring] =
err("process_block: Altair state with Phase 0 block")
func process_block*(
cfg: RuntimeConfig,
state: var bellatrix.BeaconState, blck: SomePhase0Block, flags: UpdateFlags,
cache: var StateCache): Result[void, cstring] =
err("process_block: Merge state with Phase 0 block")
# https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/altair/beacon-chain.md#block-processing # https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/altair/beacon-chain.md#block-processing
# TODO workaround for https://github.com/nim-lang/Nim/issues/18095 # TODO workaround for https://github.com/nim-lang/Nim/issues/18095
# copy of datatypes/altair.nim # copy of datatypes/altair.nim
@ -600,12 +588,12 @@ proc process_block*(
ok() ok()
# TODO workaround for https://github.com/nim-lang/Nim/issues/18095 # TODO workaround for https://github.com/nim-lang/Nim/issues/18095
type SomeMergeBlock = type SomeBellatrixBlock =
bellatrix.BeaconBlock | bellatrix.SigVerifiedBeaconBlock | bellatrix.TrustedBeaconBlock bellatrix.BeaconBlock | bellatrix.SigVerifiedBeaconBlock | bellatrix.TrustedBeaconBlock
proc process_block*( proc process_block*(
cfg: RuntimeConfig, cfg: RuntimeConfig,
state: var bellatrix.BeaconState, blck: SomeMergeBlock, flags: UpdateFlags, state: var bellatrix.BeaconState, blck: SomeBellatrixBlock,
cache: var StateCache): Result[void, cstring]= flags: UpdateFlags, cache: var StateCache): Result[void, cstring]=
## When there's a new block, we need to verify that the block is sane and ## 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 ## update the state accordingly - the state is left in an unknown state when
## block application fails (!) ## block application fails (!)
@ -629,27 +617,3 @@ proc process_block*(
state, blck.body.sync_aggregate, total_active_balance, cache) state, blck.body.sync_aggregate, total_active_balance, cache)
ok() ok()
func process_block*(
cfg: RuntimeConfig,
state: var phase0.BeaconState, blck: SomeAltairBlock, flags: UpdateFlags,
cache: var StateCache): Result[void, cstring]=
err("process_block: Phase 0 state with Altair block")
func process_block*(
cfg: RuntimeConfig,
state: var phase0.BeaconState, blck: SomeMergeBlock, flags: UpdateFlags,
cache: var StateCache): Result[void, cstring]=
err("process_block: Phase 0 state with Merge block")
func process_block*(
cfg: RuntimeConfig,
state: var altair.BeaconState, blck: SomeMergeBlock, flags: UpdateFlags,
cache: var StateCache): Result[void, cstring]=
err("process_block: Altair state with Merge block")
func process_block*(
cfg: RuntimeConfig,
state: var bellatrix.BeaconState, blck: SomeAltairBlock, flags: UpdateFlags,
cache: var StateCache): Result[void, cstring]=
err("process_block: Merge state with Altair block")