From a47b0dd5f8bab8e98148847a7084bcddb273fc58 Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Wed, 19 Jun 2024 10:34:33 +0100 Subject: [PATCH] fix spotless --- .../common/operations/OperationsTestExecutor.java | 9 ++++----- .../bellatrix/ExecutionPayloadSchemaBellatrix.java | 6 +++--- .../versions/capella/ExecutionPayloadSchemaCapella.java | 6 +++--- .../versions/deneb/ExecutionPayloadSchemaDeneb.java | 6 +++--- .../execution/versions/electra/DepositRequest.java | 2 +- .../versions/electra/block/BlockProcessorElectra.java | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java b/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java index 28ccf4023a6..75022fe8afe 100644 --- a/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java +++ b/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java @@ -316,12 +316,11 @@ private void processOperation( case BLS_TO_EXECUTION_CHANGE -> processBlsToExecutionChange(testDefinition, state, processor); case WITHDRAWAL -> processWithdrawal(testDefinition, state, processor); case DEPOSIT_REQUEST -> processDepositRequest(testDefinition, state, processor); - case EXECUTION_LAYER_WITHDRAWAL_REQUEST -> - processExecutionLayerWithdrawalRequest(testDefinition, state, processor); + case EXECUTION_LAYER_WITHDRAWAL_REQUEST -> processExecutionLayerWithdrawalRequest( + testDefinition, state, processor); case CONSOLIDATION -> processConsolidation(testDefinition, state, processor); - default -> - throw new UnsupportedOperationException( - "Operation " + operation + " not implemented in OperationTestExecutor"); + default -> throw new UnsupportedOperationException( + "Operation " + operation + " not implemented in OperationTestExecutor"); } } diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/bellatrix/ExecutionPayloadSchemaBellatrix.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/bellatrix/ExecutionPayloadSchemaBellatrix.java index 0597b471396..c371125ab5e 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/bellatrix/ExecutionPayloadSchemaBellatrix.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/bellatrix/ExecutionPayloadSchemaBellatrix.java @@ -118,13 +118,13 @@ public WithdrawalSchema getWithdrawalSchemaRequired() { @Override public SszListSchema> - getDepositRequestsSchemaRequired() { - throw new IllegalStateException("Attempted to get a deposit receipts schema from bellatrix"); + getDepositRequestsSchemaRequired() { + throw new IllegalStateException("Attempted to get a deposit requests schema from bellatrix"); } @Override public DepositRequestSchema getDepositRequestSchemaRequired() { - throw new IllegalStateException("Attempted to get a deposit receipt schema from bellatrix"); + throw new IllegalStateException("Attempted to get a deposit request schema from bellatrix"); } @Override diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/capella/ExecutionPayloadSchemaCapella.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/capella/ExecutionPayloadSchemaCapella.java index 07848f15be6..baed7ae01f9 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/capella/ExecutionPayloadSchemaCapella.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/capella/ExecutionPayloadSchemaCapella.java @@ -125,13 +125,13 @@ public WithdrawalSchema getWithdrawalSchemaRequired() { @Override public SszListSchema> - getDepositRequestsSchemaRequired() { - throw new IllegalStateException("Attempted to get a deposit receipts schema from capella"); + getDepositRequestsSchemaRequired() { + throw new IllegalStateException("Attempted to get a deposit requests schema from capella"); } @Override public DepositRequestSchema getDepositRequestSchemaRequired() { - throw new IllegalStateException("Attempted to get a deposit receipt schema from capella"); + throw new IllegalStateException("Attempted to get a deposit request schema from capella"); } @Override diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadSchemaDeneb.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadSchemaDeneb.java index 9cf9749df88..ac15fd17545 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadSchemaDeneb.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadSchemaDeneb.java @@ -133,13 +133,13 @@ public WithdrawalSchema getWithdrawalSchemaRequired() { @Override public SszListSchema> - getDepositRequestsSchemaRequired() { - throw new IllegalStateException("Attempted to get a deposit receipts schema from deneb"); + getDepositRequestsSchemaRequired() { + throw new IllegalStateException("Attempted to get a deposit requests schema from deneb"); } @Override public DepositRequestSchema getDepositRequestSchemaRequired() { - throw new IllegalStateException("Attempted to get a deposit receipt schema from deneb"); + throw new IllegalStateException("Attempted to get a deposit request schema from deneb"); } @Override diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/electra/DepositRequest.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/electra/DepositRequest.java index 1c82004fb8e..fc67724a394 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/electra/DepositRequest.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/electra/DepositRequest.java @@ -26,7 +26,7 @@ public class DepositRequest extends Container5< - DepositRequest, SszPublicKey, SszBytes32, SszUInt64, SszSignature, SszUInt64> { + DepositRequest, SszPublicKey, SszBytes32, SszUInt64, SszSignature, SszUInt64> { DepositRequest( final DepositRequestSchema schema, diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java index 331505040be..81479e8f5c5 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java @@ -133,7 +133,7 @@ protected void processOperationsNoValidation( .orElseThrow( () -> new BlockProcessingException( - "Deposit receipts were not found during block processing."))); + "Deposit requests were not found during block processing."))); processConsolidations(state, BeaconBlockBodyElectra.required(body).getConsolidations()); }); }