From 91c6924df44b93bec10c7979461c9d5bca71ddbe Mon Sep 17 00:00:00 2001 From: NC <17676176+ensi321@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:10:45 +0900 Subject: [PATCH] Variable naming --- packages/beacon-node/src/chain/opPools/opPool.ts | 4 ++-- packages/state-transition/src/util/electra.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/beacon-node/src/chain/opPools/opPool.ts b/packages/beacon-node/src/chain/opPools/opPool.ts index 8de08b7b419b..bc7ae31d949b 100644 --- a/packages/beacon-node/src/chain/opPools/opPool.ts +++ b/packages/beacon-node/src/chain/opPools/opPool.ts @@ -209,7 +209,7 @@ export class OpPool { const endAttesterSlashings = stepsMetrics?.startTimer(); const attesterSlashings: AttesterSlashing[] = []; - const maxAttesterSlashing = stateFork >= ForkSeq.electra ? MAX_ATTESTER_SLASHINGS_ELECTRA : MAX_ATTESTER_SLASHINGS; + const maxAttesterSlashings = stateFork >= ForkSeq.electra ? MAX_ATTESTER_SLASHINGS_ELECTRA : MAX_ATTESTER_SLASHINGS; attesterSlashing: for (const attesterSlashing of this.attesterSlashings.values()) { /** Indices slashable in this attester slashing */ const slashableIndices = new Set(); @@ -224,7 +224,7 @@ export class OpPool { if (isSlashableAtEpoch(validator, stateEpoch)) { slashableIndices.add(index); } - if (attesterSlashings.length >= maxAttesterSlashing) { + if (attesterSlashings.length >= maxAttesterSlashings) { break attesterSlashing; } } diff --git a/packages/state-transition/src/util/electra.ts b/packages/state-transition/src/util/electra.ts index 53f53aaf8d61..666f45435eb1 100644 --- a/packages/state-transition/src/util/electra.ts +++ b/packages/state-transition/src/util/electra.ts @@ -28,15 +28,15 @@ export function isFullyWithdrawableValidator( balance: number, epoch: number ): boolean { - const {withdrawableEpoch, withdrawalCredentials: withdrawalCredential} = validatorCredential; + const {withdrawableEpoch, withdrawalCredentials} = validatorCredential; if (fork < ForkSeq.capella) { throw new Error(`isFullyWithdrawableValidator not supported at forkSeq=${fork} < ForkSeq.capella`); } const hasWithdrawableCredentials = fork >= ForkSeq.electra - ? hasExecutionWithdrawalCredential(withdrawalCredential) - : hasEth1WithdrawalCredential(withdrawalCredential); + ? hasExecutionWithdrawalCredential(withdrawalCredentials) + : hasEth1WithdrawalCredential(withdrawalCredentials); return hasWithdrawableCredentials && withdrawableEpoch <= epoch && balance > 0; } @@ -46,18 +46,18 @@ export function isPartiallyWithdrawableValidator( validatorCredential: ValidatorInfo, balance: number ): boolean { - const {effectiveBalance, withdrawalCredentials: withdrawalCredential} = validatorCredential; + const {effectiveBalance, withdrawalCredentials} = validatorCredential; if (fork < ForkSeq.capella) { throw new Error(`isPartiallyWithdrawableValidator not supported at forkSeq=${fork} < ForkSeq.capella`); } const hasWithdrawableCredentials = fork >= ForkSeq.electra - ? hasExecutionWithdrawalCredential(withdrawalCredential) - : hasEth1WithdrawalCredential(withdrawalCredential); + ? hasExecutionWithdrawalCredential(withdrawalCredentials) + : hasEth1WithdrawalCredential(withdrawalCredentials); const validatorMaxEffectiveBalance = - fork >= ForkSeq.electra ? getValidatorMaxEffectiveBalance(withdrawalCredential) : MAX_EFFECTIVE_BALANCE; + fork >= ForkSeq.electra ? getValidatorMaxEffectiveBalance(withdrawalCredentials) : MAX_EFFECTIVE_BALANCE; const hasMaxEffectiveBalance = effectiveBalance === validatorMaxEffectiveBalance; const hasExcessBalance = balance > validatorMaxEffectiveBalance;