Skip to content

Commit 79d67ba

Browse files
committed
minor refactor
1 parent 69ee35d commit 79d67ba

File tree

1 file changed

+37
-23
lines changed

1 file changed

+37
-23
lines changed

tests/core/pyspec/eth2spec/test/electra/epoch_processing/test_process_pending_balance_deposits.py

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
)
66

77

8+
def run_process_pending_balance_deposits(spec, state):
9+
yield from run_epoch_processing_with(spec, state, 'process_pending_balance_deposits')
10+
11+
812
@with_electra_and_later
913
@spec_state_test
1014
def test_pending_deposit_min_activation_balance(spec, state):
@@ -14,9 +18,9 @@ def test_pending_deposit_min_activation_balance(spec, state):
1418
spec.PendingBalanceDeposit(index=index, amount=amount)
1519
)
1620
pre_balance = state.balances[index]
17-
yield from run_epoch_processing_with(
18-
spec, state, "process_pending_balance_deposits"
19-
)
21+
22+
yield from run_process_pending_balance_deposits(spec, state)
23+
2024
assert state.balances[index] == pre_balance + amount
2125
# No leftover deposit balance to consume when there are no deposits left to process
2226
assert state.deposit_balance_to_consume == 0
@@ -32,9 +36,9 @@ def test_pending_deposit_balance_equal_churn(spec, state):
3236
spec.PendingBalanceDeposit(index=index, amount=amount)
3337
)
3438
pre_balance = state.balances[index]
35-
yield from run_epoch_processing_with(
36-
spec, state, "process_pending_balance_deposits"
37-
)
39+
40+
yield from run_process_pending_balance_deposits(spec, state)
41+
3842
assert state.balances[index] == pre_balance + amount
3943
assert state.deposit_balance_to_consume == 0
4044
assert state.pending_balance_deposits == []
@@ -49,9 +53,9 @@ def test_pending_deposit_balance_above_churn(spec, state):
4953
spec.PendingBalanceDeposit(index=index, amount=amount)
5054
)
5155
pre_balance = state.balances[index]
52-
yield from run_epoch_processing_with(
53-
spec, state, "process_pending_balance_deposits"
54-
)
56+
57+
yield from run_process_pending_balance_deposits(spec, state)
58+
5559
# deposit was above churn, balance hasn't changed
5660
assert state.balances[index] == pre_balance
5761
# deposit balance to consume is the full churn limit
@@ -74,9 +78,9 @@ def test_pending_deposit_preexisting_churn(spec, state):
7478
spec.PendingBalanceDeposit(index=index, amount=amount)
7579
)
7680
pre_balance = state.balances[index]
77-
yield from run_epoch_processing_with(
78-
spec, state, "process_pending_balance_deposits"
79-
)
81+
82+
yield from run_process_pending_balance_deposits(spec, state)
83+
8084
# balance was deposited correctly
8185
assert state.balances[index] == pre_balance + amount
8286
# No leftover deposit balance to consume when there are no deposits left to process
@@ -96,9 +100,9 @@ def test_multiple_pending_deposits_below_churn(spec, state):
96100
spec.PendingBalanceDeposit(index=1, amount=amount)
97101
)
98102
pre_balances = state.balances.copy()
99-
yield from run_epoch_processing_with(
100-
spec, state, "process_pending_balance_deposits"
101-
)
103+
104+
yield from run_process_pending_balance_deposits(spec, state)
105+
102106
for i in [0, 1]:
103107
assert state.balances[i] == pre_balances[i] + amount
104108
# No leftover deposit balance to consume when there are no deposits left to process
@@ -116,9 +120,9 @@ def test_multiple_pending_deposits_above_churn(spec, state):
116120
spec.PendingBalanceDeposit(index=i, amount=amount)
117121
)
118122
pre_balances = state.balances.copy()
119-
yield from run_epoch_processing_with(
120-
spec, state, "process_pending_balance_deposits"
121-
)
123+
124+
yield from run_process_pending_balance_deposits(spec, state)
125+
122126
# First two deposits are processed, third is not because above churn
123127
for i in [0, 1]:
124128
assert state.balances[i] == pre_balances[i] + amount
@@ -144,7 +148,9 @@ def test_skipped_deposit_exiting_validator(spec, state):
144148
pre_balance = state.balances[index]
145149
# Initiate the validator's exit
146150
spec.initiate_validator_exit(state, index)
147-
yield from run_epoch_processing_with(spec, state, 'process_pending_balance_deposits')
151+
152+
yield from run_process_pending_balance_deposits(spec, state)
153+
148154
# Deposit is skipped because validator is exiting
149155
assert state.balances[index] == pre_balance
150156
# All deposits either processed or postponed, no leftover deposit balance to consume
@@ -165,7 +171,9 @@ def test_multiple_skipped_deposits_exiting_validators(spec, state):
165171
spec.initiate_validator_exit(state, i)
166172
pre_pending_balance_deposits = state.pending_balance_deposits.copy()
167173
pre_balances = state.balances.copy()
168-
yield from run_epoch_processing_with(spec, state, 'process_pending_balance_deposits')
174+
175+
yield from run_process_pending_balance_deposits(spec, state)
176+
169177
# All deposits are postponed, no balance changes
170178
assert state.balances == pre_balances
171179
# All deposits are postponed, no leftover deposit balance to consume
@@ -183,7 +191,9 @@ def test_multiple_pending_one_skipped(spec, state):
183191
pre_balances = state.balances.copy()
184192
# Initiate the second validator's exit
185193
spec.initiate_validator_exit(state, 1)
186-
yield from run_epoch_processing_with(spec, state, 'process_pending_balance_deposits')
194+
195+
yield from run_process_pending_balance_deposits(spec, state)
196+
187197
# First and last deposit are processed, second is not because of exiting
188198
for i in [0, 2]:
189199
assert state.balances[i] == pre_balances[i] + amount
@@ -206,7 +216,9 @@ def test_mixture_of_skipped_and_above_churn(spec, state):
206216
pre_balances = state.balances.copy()
207217
# Initiate the second validator's exit
208218
spec.initiate_validator_exit(state, 1)
209-
yield from run_epoch_processing_with(spec, state, 'process_pending_balance_deposits')
219+
220+
yield from run_process_pending_balance_deposits(spec, state)
221+
210222
# First deposit is processed
211223
assert state.balances[0] == pre_balances[0] + amount01
212224
# Second deposit is postponed, third is above churn
@@ -231,7 +243,9 @@ def test_processing_deposit_of_withdrawable_validator(spec, state):
231243
spec.initiate_validator_exit(state, index)
232244
# Set epoch to withdrawable epoch + 1 to allow processing of the deposit
233245
state.slot = spec.SLOTS_PER_EPOCH * (state.validators[index].withdrawable_epoch + 1)
234-
yield from run_epoch_processing_with(spec, state, 'process_pending_balance_deposits')
246+
247+
yield from run_process_pending_balance_deposits(spec, state)
248+
235249
# Deposit is correctly processed
236250
assert state.balances[index] == pre_balance + amount
237251
# No leftover deposit balance to consume when there are no deposits left to process

0 commit comments

Comments
 (0)