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

rm unused parameters of get_state_exit_queue_info() (#6167)

This commit is contained in:
tersec 2024-04-03 01:45:57 +00:00 committed by GitHub
parent 5f4fa9ae69
commit 27ec2893ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_chain/spec/beaconstate.nim
View File

@ -91,8 +91,7 @@ func get_validator_activation_churn_limit*(
get_validator_churn_limit(cfg, state, cache)) get_validator_churn_limit(cfg, state, cache))
# https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/phase0/beacon-chain.md#initiate_validator_exit # https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/phase0/beacon-chain.md#initiate_validator_exit
func get_state_exit_queue_info*( func get_state_exit_queue_info*(state: ForkyBeaconState): ExitQueueInfo =
cfg: RuntimeConfig, state: var ForkyBeaconState, cache: var StateCache): ExitQueueInfo =
var var
exit_queue_epoch = compute_activation_exit_epoch(get_current_epoch(state)) exit_queue_epoch = compute_activation_exit_epoch(get_current_epoch(state))
exit_queue_churn: uint64 exit_queue_churn: uint64

4
beacon_chain/spec/state_transition_block.nim
View File

@ -262,7 +262,7 @@ proc process_attester_slashing*(
for index in slashed_attesters: for index in slashed_attesters:
doAssert strictVerification notin flags or doAssert strictVerification notin flags or
cur_exit_queue_info == get_state_exit_queue_info(cfg, state, cache) cur_exit_queue_info == get_state_exit_queue_info(state)
let (new_proposer_reward, new_exit_queue_info) = ? slash_validator( let (new_proposer_reward, new_exit_queue_info) = ? slash_validator(
cfg, state, index, cur_exit_queue_info, cache) cfg, state, index, cur_exit_queue_info, cache)
proposer_reward += new_proposer_reward proposer_reward += new_proposer_reward
@ -477,7 +477,7 @@ proc process_operations(cfg: RuntimeConfig,
var exit_queue_info = var exit_queue_info =
if body.proposer_slashings.len + body.attester_slashings.len + if body.proposer_slashings.len + body.attester_slashings.len +
body.voluntary_exits.len > 0: body.voluntary_exits.len > 0:
get_state_exit_queue_info(cfg, state, cache) get_state_exit_queue_info(state)
else: else:
default(ExitQueueInfo) # not used default(ExitQueueInfo) # not used

3
beacon_chain/spec/state_transition_epoch.nim
View File

@ -911,8 +911,7 @@ func process_registry_updates*(
# more than one. Therefore, only calculate the information required for # more than one. Therefore, only calculate the information required for
# initiate_validator_exit if there actually is at least one. # initiate_validator_exit if there actually is at least one.
let exit_queue_info = maybe_exit_queue_info.valueOr: let exit_queue_info = maybe_exit_queue_info.valueOr:
let initial_exit_queue_info = get_state_exit_queue_info( let initial_exit_queue_info = get_state_exit_queue_info(state)
cfg, state, cache)
maybe_exit_queue_info = Opt.some initial_exit_queue_info maybe_exit_queue_info = Opt.some initial_exit_queue_info
initial_exit_queue_info initial_exit_queue_info

12
nfuzz/libnfuzz.nim
View File

@ -109,8 +109,8 @@ proc nfuzz_attester_slashing(input: openArray[byte], xoutput: ptr byte,
xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} = xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} =
decodeAndProcess(AttesterSlashingInput): decodeAndProcess(AttesterSlashingInput):
process_attester_slashing(getRuntimeConfig(some "mainnet"), data.state, process_attester_slashing(getRuntimeConfig(some "mainnet"), data.state,
data.attesterSlashing, flags, get_state_exit_queue_info( data.attesterSlashing, flags,
getRuntimeConfig(some "mainnet"), data.state, cache), cache).isOk get_state_exit_queue_info(data.state), cache).isOk
proc nfuzz_block(input: openArray[byte], xoutput: ptr byte, proc nfuzz_block(input: openArray[byte], xoutput: ptr byte,
xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} = xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} =
@ -155,15 +155,15 @@ proc nfuzz_proposer_slashing(input: openArray[byte], xoutput: ptr byte,
xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} = xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} =
decodeAndProcess(ProposerSlashingInput): decodeAndProcess(ProposerSlashingInput):
process_proposer_slashing(getRuntimeConfig(some "mainnet"), data.state, process_proposer_slashing(getRuntimeConfig(some "mainnet"), data.state,
data.proposerSlashing, flags, get_state_exit_queue_info( data.proposerSlashing, flags,
getRuntimeConfig(some "mainnet"), data.state, cache), cache).isOk get_state_exit_queue_info(data.state), cache).isOk
proc nfuzz_voluntary_exit(input: openArray[byte], xoutput: ptr byte, proc nfuzz_voluntary_exit(input: openArray[byte], xoutput: ptr byte,
xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} = xoutput_size: ptr uint, disable_bls: bool): bool {.exportc, raises: [FuzzCrashError].} =
decodeAndProcess(VoluntaryExitInput): decodeAndProcess(VoluntaryExitInput):
process_voluntary_exit(getRuntimeConfig(some "mainnet"), data.state, process_voluntary_exit(getRuntimeConfig(some "mainnet"), data.state,
data.exit, flags, get_state_exit_queue_info( data.exit, flags,
getRuntimeConfig(some "mainnet"), data.state, cache), cache).isOk get_state_exit_queue_info(data.state), cache).isOk
# Note: Could also accept raw input pointer and access list_size + seed here. # Note: Could also accept raw input pointer and access list_size + seed here.
# However, list_size needs to be known also outside this proc to allocate xoutput. # However, list_size needs to be known also outside this proc to allocate xoutput.

9
tests/consensus_spec/altair/test_fixture_operations.nim
View File

@ -96,8 +96,7 @@ suite baseDescription & "Attester Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_attester_slashing( doAssert (? process_attester_slashing(
defaultRuntimeConfig, preState, attesterSlashing, {strictVerification}, defaultRuntimeConfig, preState, attesterSlashing, {strictVerification},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpAttSlashingDir): for path in walkTests(OpAttSlashingDir):
@ -137,8 +136,7 @@ suite baseDescription & "Proposer Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_proposer_slashing( doAssert (? process_proposer_slashing(
defaultRuntimeConfig, preState, proposerSlashing, {}, defaultRuntimeConfig, preState, proposerSlashing, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpProposerSlashingDir): for path in walkTests(OpProposerSlashingDir):
@ -168,8 +166,7 @@ suite baseDescription & "Voluntary Exit " & preset():
var cache: StateCache var cache: StateCache
if process_voluntary_exit( if process_voluntary_exit(
defaultRuntimeConfig, preState, voluntaryExit, {}, defaultRuntimeConfig, preState, voluntaryExit, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache).isOk:
cache).isOk:
ok() ok()
else: else:
err("") err("")

9
tests/consensus_spec/bellatrix/test_fixture_operations.nim
View File

@ -102,8 +102,7 @@ suite baseDescription & "Attester Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_attester_slashing( doAssert (? process_attester_slashing(
defaultRuntimeConfig, preState, attesterSlashing, {strictVerification}, defaultRuntimeConfig, preState, attesterSlashing, {strictVerification},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpAttSlashingDir): for path in walkTests(OpAttSlashingDir):
@ -162,8 +161,7 @@ suite baseDescription & "Proposer Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_proposer_slashing( doAssert (? process_proposer_slashing(
defaultRuntimeConfig, preState, proposerSlashing, {}, defaultRuntimeConfig, preState, proposerSlashing, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpProposerSlashingDir): for path in walkTests(OpProposerSlashingDir):
@ -193,8 +191,7 @@ suite baseDescription & "Voluntary Exit " & preset():
var cache: StateCache var cache: StateCache
if process_voluntary_exit( if process_voluntary_exit(
defaultRuntimeConfig, preState, voluntaryExit, {}, defaultRuntimeConfig, preState, voluntaryExit, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache).isOk:
cache).isOk:
ok() ok()
else: else:
err("") err("")

9
tests/consensus_spec/capella/test_fixture_operations.nim
View File

@ -106,8 +106,7 @@ suite baseDescription & "Attester Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_attester_slashing( doAssert (? process_attester_slashing(
defaultRuntimeConfig, preState, attesterSlashing, {strictVerification}, defaultRuntimeConfig, preState, attesterSlashing, {strictVerification},
get_state_exit_queue_info(defaultRuntimeConfig, preState, get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache), cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpAttSlashingDir): for path in walkTests(OpAttSlashingDir):
@ -179,8 +178,7 @@ suite baseDescription & "Proposer Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_proposer_slashing( doAssert (? process_proposer_slashing(
defaultRuntimeConfig, preState, proposerSlashing, {}, defaultRuntimeConfig, preState, proposerSlashing, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpProposerSlashingDir): for path in walkTests(OpProposerSlashingDir):
@ -210,8 +208,7 @@ suite baseDescription & "Voluntary Exit " & preset():
var cache: StateCache var cache: StateCache
if process_voluntary_exit( if process_voluntary_exit(
defaultRuntimeConfig, preState, voluntaryExit, {}, defaultRuntimeConfig, preState, voluntaryExit, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache).isOk:
cache).isOk:
ok() ok()
else: else:
err("") err("")

9
tests/consensus_spec/deneb/test_fixture_operations.nim
View File

@ -106,8 +106,7 @@ suite baseDescription & "Attester Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_attester_slashing( doAssert (? process_attester_slashing(
defaultRuntimeConfig, preState, attesterSlashing, {strictVerification}, defaultRuntimeConfig, preState, attesterSlashing, {strictVerification},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpAttSlashingDir): for path in walkTests(OpAttSlashingDir):
@ -181,8 +180,7 @@ suite baseDescription & "Proposer Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_proposer_slashing( doAssert (? process_proposer_slashing(
defaultRuntimeConfig, preState, proposerSlashing, {}, defaultRuntimeConfig, preState, proposerSlashing, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpProposerSlashingDir): for path in walkTests(OpProposerSlashingDir):
@ -212,8 +210,7 @@ suite baseDescription & "Voluntary Exit " & preset():
var cache: StateCache var cache: StateCache
if process_voluntary_exit( if process_voluntary_exit(
defaultRuntimeConfig, preState, voluntaryExit, {}, defaultRuntimeConfig, preState, voluntaryExit, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache).isOk:
cache).isOk:
ok() ok()
else: else:
err("") err("")

9
tests/consensus_spec/phase0/test_fixture_operations.nim
View File

@ -87,8 +87,7 @@ suite baseDescription & "Attester Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_attester_slashing( doAssert (? process_attester_slashing(
defaultRuntimeConfig, preState, attesterSlashing, {strictVerification}, defaultRuntimeConfig, preState, attesterSlashing, {strictVerification},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpAttSlashingDir): for path in walkTests(OpAttSlashingDir):
@ -129,8 +128,7 @@ suite baseDescription & "Proposer Slashing " & preset():
var cache: StateCache var cache: StateCache
doAssert (? process_proposer_slashing( doAssert (? process_proposer_slashing(
defaultRuntimeConfig, preState, proposerSlashing, {}, defaultRuntimeConfig, preState, proposerSlashing, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, get_state_exit_queue_info(preState), cache))[0] > 0.Gwei
cache), cache))[0] > 0.Gwei
ok() ok()
for path in walkTests(OpProposerSlashingDir): for path in walkTests(OpProposerSlashingDir):
@ -145,8 +143,7 @@ suite baseDescription & "Voluntary Exit " & preset():
var cache: StateCache var cache: StateCache
if process_voluntary_exit( if process_voluntary_exit(
defaultRuntimeConfig, preState, voluntaryExit, {}, defaultRuntimeConfig, preState, voluntaryExit, {},
get_state_exit_queue_info(defaultRuntimeConfig, preState, cache), get_state_exit_queue_info(preState), cache).isOk:
cache).isOk:
ok() ok()
else: else:
err("") err("")