|
35 | 35 | import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.altair.SyncAggregate;
|
36 | 36 | import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
|
37 | 37 | import tech.pegasys.teku.spec.datastructures.execution.versions.electra.DepositReceipt;
|
38 |
| -import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionLayerExit; |
| 38 | +import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionLayerWithdrawalRequest; |
39 | 39 | import tech.pegasys.teku.spec.datastructures.operations.Attestation;
|
40 | 40 | import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
|
41 | 41 | import tech.pegasys.teku.spec.datastructures.operations.Deposit;
|
@@ -75,7 +75,7 @@ private enum Operation {
|
75 | 75 | BLS_TO_EXECUTION_CHANGE,
|
76 | 76 | WITHDRAWAL,
|
77 | 77 | DEPOSIT_RECEIPT,
|
78 |
| - EXECUTION_LAYER_EXIT |
| 78 | + EXECUTION_LAYER_WITHDRAWAL_REQUEST |
79 | 79 | }
|
80 | 80 |
|
81 | 81 | public static final ImmutableMap<String, TestExecutor> OPERATIONS_TEST_TYPES =
|
@@ -120,9 +120,10 @@ private enum Operation {
|
120 | 120 | "operations/deposit_receipt",
|
121 | 121 | new OperationsTestExecutor<>("deposit_receipt.ssz_snappy", Operation.DEPOSIT_RECEIPT))
|
122 | 122 | .put(
|
123 |
| - "operations/execution_layer_exit", |
| 123 | + "operations/execution_layer_withdrawal_request", |
124 | 124 | new OperationsTestExecutor<>(
|
125 |
| - "execution_layer_exit.ssz_snappy", Operation.EXECUTION_LAYER_EXIT)) |
| 125 | + "execution_layer_withdrawal_request.ssz_snappy", |
| 126 | + Operation.EXECUTION_LAYER_WITHDRAWAL_REQUEST)) |
126 | 127 | .build();
|
127 | 128 |
|
128 | 129 | private final String dataFileName;
|
@@ -310,7 +311,8 @@ private void processOperation(
|
310 | 311 | case BLS_TO_EXECUTION_CHANGE -> processBlsToExecutionChange(testDefinition, state, processor);
|
311 | 312 | case WITHDRAWAL -> processWithdrawal(testDefinition, state, processor);
|
312 | 313 | case DEPOSIT_RECEIPT -> processDepositReceipt(testDefinition, state, processor);
|
313 |
| - case EXECUTION_LAYER_EXIT -> processExecutionLayerExit(testDefinition, state, processor); |
| 314 | + case EXECUTION_LAYER_WITHDRAWAL_REQUEST -> processExecutionLayerWithdrawalRequest( |
| 315 | + testDefinition, state, processor); |
314 | 316 | default -> throw new UnsupportedOperationException(
|
315 | 317 | "Operation " + operation + " not implemented in OperationTestExecutor");
|
316 | 318 | }
|
@@ -348,14 +350,14 @@ private void processDepositReceipt(
|
348 | 350 | processor.processDepositReceipt(state, depositReceipt);
|
349 | 351 | }
|
350 | 352 |
|
351 |
| - private void processExecutionLayerExit( |
| 353 | + private void processExecutionLayerWithdrawalRequest( |
352 | 354 | final TestDefinition testDefinition,
|
353 | 355 | final MutableBeaconState state,
|
354 | 356 | final OperationProcessor processor)
|
355 | 357 | throws BlockProcessingException {
|
356 |
| - final ExecutionLayerExit executionLayerExit = |
357 |
| - loadSsz(testDefinition, dataFileName, ExecutionLayerExit.SSZ_SCHEMA); |
358 |
| - processor.processExecutionLayerExit(state, executionLayerExit); |
| 358 | + final ExecutionLayerWithdrawalRequest executionLayerWithdrawalRequest = |
| 359 | + loadSsz(testDefinition, dataFileName, ExecutionLayerWithdrawalRequest.SSZ_SCHEMA); |
| 360 | + processor.processExecutionLayerWithdrawalRequest(state, executionLayerWithdrawalRequest); |
359 | 361 | }
|
360 | 362 |
|
361 | 363 | private SignedVoluntaryExit loadVoluntaryExit(final TestDefinition testDefinition) {
|
@@ -422,7 +424,7 @@ public void checkBlockInclusionValidation(
|
422 | 424 | EXECUTION_PAYLOAD,
|
423 | 425 | WITHDRAWAL,
|
424 | 426 | DEPOSIT_RECEIPT,
|
425 |
| - EXECUTION_LAYER_EXIT -> {} |
| 427 | + EXECUTION_LAYER_WITHDRAWAL_REQUEST -> {} |
426 | 428 | }
|
427 | 429 | }
|
428 | 430 |
|
|
0 commit comments