run spotlessApply

Signed-off-by: Stefan <[email protected]>
pinges · Aug 4, 2023 · fb3f437 · fb3f437
1 parent b6615df
commit fb3f437
Show file tree

Hide file tree

Showing 28 changed files with 284 additions and 193 deletions.
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java
@@ -56,7 +56,8 @@ public static BlockHeader createBlockHeader(
         null,
         null,
         null,
-            null, null,
+        null,
+        null,
         blockHeaderFunctions);
   }
 }
diff --git a/...e/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeBlockCreator.java b/...e/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeBlockCreator.java
@@ -86,19 +86,19 @@ public MergeBlockCreator(
   /**
    * Create block and return block creation result.
    *
-   * @param maybeTransactions     the maybe transactions
-   * @param random                the random
-   * @param timestamp             the timestamp
-   * @param withdrawals           optional list of withdrawals
+   * @param maybeTransactions the maybe transactions
+   * @param random the random
+   * @param timestamp the timestamp
+   * @param withdrawals optional list of withdrawals
    * @param parentBeaconBlockRoot optional root hash of the parent beacon block
    * @return the block creation result
    */
   public BlockCreationResult createBlock(
-          final Optional<List<Transaction>> maybeTransactions,
-          final Bytes32 random,
-          final long timestamp,
-          final Optional<List<Withdrawal>> withdrawals,
-          final Optional<Bytes32> parentBeaconBlockRoot) {
+      final Optional<List<Transaction>> maybeTransactions,
+      final Bytes32 random,
+      final long timestamp,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<Bytes32> parentBeaconBlockRoot) {
 
     return createBlock(
         maybeTransactions,

diff --git a/...ge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java b/...ge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
@@ -242,11 +242,12 @@ public void changeTargetGasLimit(final Long newTargetGasLimit) {
 
   @Override
   public PayloadIdentifier preparePayload(
-          final BlockHeader parentHeader,
-          final Long timestamp,
-          final Bytes32 prevRandao,
-          final Address feeRecipient,
-          final Optional<List<Withdrawal>> withdrawals, final Optional<Bytes32> parentBeaconBlockRoot) {
+      final BlockHeader parentHeader,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<Bytes32> parentBeaconBlockRoot) {
 
     // we assume that preparePayload is always called sequentially, since the RPC Engine calls
     // are sequential, if this assumption changes then more synchronization should be added to
@@ -273,7 +274,12 @@ public PayloadIdentifier preparePayload(
     // put the empty block in first
     final Block emptyBlock =
         mergeBlockCreator
-            .createBlock(Optional.of(Collections.emptyList()), prevRandao, timestamp, withdrawals, parentBeaconBlockRoot)
+            .createBlock(
+                Optional.of(Collections.emptyList()),
+                prevRandao,
+                timestamp,
+                withdrawals,
+                parentBeaconBlockRoot)
             .getBlock();
 
     BlockProcessingResult result = validateProposedBlock(emptyBlock);
@@ -294,7 +300,13 @@ public PayloadIdentifier preparePayload(
       }
     }
 
-    tryToBuildBetterBlock(timestamp, prevRandao, payloadIdentifier, mergeBlockCreator, withdrawals, parentBeaconBlockRoot);
+    tryToBuildBetterBlock(
+        timestamp,
+        prevRandao,
+        payloadIdentifier,
+        mergeBlockCreator,
+        withdrawals,
+        parentBeaconBlockRoot);
 
     return payloadIdentifier;
   }
@@ -330,14 +342,17 @@ public void finalizeProposalById(final PayloadIdentifier payloadId) {
   }
 
   private void tryToBuildBetterBlock(
-          final Long timestamp,
-          final Bytes32 random,
-          final PayloadIdentifier payloadIdentifier,
-          final MergeBlockCreator mergeBlockCreator,
-          final Optional<List<Withdrawal>> withdrawals, final Optional<Bytes32> parentBeaconBlockRoot) {
+      final Long timestamp,
+      final Bytes32 random,
+      final PayloadIdentifier payloadIdentifier,
+      final MergeBlockCreator mergeBlockCreator,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<Bytes32> parentBeaconBlockRoot) {
 
     final Supplier<BlockCreationResult> blockCreator =
-        () -> mergeBlockCreator.createBlock(Optional.empty(), random, timestamp, withdrawals, parentBeaconBlockRoot);
+        () ->
+            mergeBlockCreator.createBlock(
+                Optional.empty(), random, timestamp, withdrawals, parentBeaconBlockRoot);
 
     LOG.debug(
         "Block creation started for payload id {}, remaining time is {}ms",

diff --git a/.../main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java b/.../main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java
@@ -36,20 +36,21 @@ public interface MergeMiningCoordinator extends MiningCoordinator {
   /**
    * Prepare payload identifier.
    *
-   * @param parentHeader          the parent header
-   * @param timestamp             the timestamp
-   * @param prevRandao            the prev randao
-   * @param feeRecipient          the fee recipient
-   * @param withdrawals           the optional list of withdrawals
+   * @param parentHeader the parent header
+   * @param timestamp the timestamp
+   * @param prevRandao the prev randao
+   * @param feeRecipient the fee recipient
+   * @param withdrawals the optional list of withdrawals
    * @param parentBeaconBlockRoot optional root hash of the parent beacon block
    * @return the payload identifier
    */
   PayloadIdentifier preparePayload(
-          final BlockHeader parentHeader,
-          final Long timestamp,
-          final Bytes32 prevRandao,
-          final Address feeRecipient,
-          final Optional<List<Withdrawal>> withdrawals, final Optional<Bytes32> parentBeaconBlockRoot);
+      final BlockHeader parentHeader,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<Bytes32> parentBeaconBlockRoot);
 
   @Override
   default boolean isCompatibleWithEngineApi() {

diff --git a/...c/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java b/...c/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java
@@ -143,11 +143,12 @@ public void changeTargetGasLimit(final Long targetGasLimit) {
 
   @Override
   public PayloadIdentifier preparePayload(
-          final BlockHeader parentHeader,
-          final Long timestamp,
-          final Bytes32 prevRandao,
-          final Address feeRecipient,
-          final Optional<List<Withdrawal>> withdrawals, final Optional<Bytes32> parentBeaconBlockRoot) {
+      final BlockHeader parentHeader,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<Bytes32> parentBeaconBlockRoot) {
     return mergeCoordinator.preparePayload(
         parentHeader, timestamp, prevRandao, feeRecipient, withdrawals, parentBeaconBlockRoot);
   }

diff --git a/...rc/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java b/...rc/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
@@ -256,7 +256,8 @@ public void coinbaseShouldMatchSuggestedFeeRecipient() {
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            EMPTY_WITHDRAWALS, Optional.empty());
+            EMPTY_WITHDRAWALS,
+            Optional.empty());
 
     ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
         ArgumentCaptor.forClass(BlockWithReceipts.class);
@@ -294,7 +295,8 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid()
               .doThrow(new MerkleTrieException("missing leaf"))
               .doCallRealMethod()
               .when(beingSpiedOn)
-              .createBlock(any(), any(Bytes32.class), anyLong(), eq(Optional.empty()), Optional.empty());
+              .createBlock(
+                  any(), any(Bytes32.class), anyLong(), eq(Optional.empty()), Optional.empty());
           return beingSpiedOn;
         };
 
@@ -330,7 +332,8 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid()
             System.currentTimeMillis() / 1000,
             Bytes32.random(),
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     verify(willThrow, never()).addBadBlock(any(), any());
     blockCreationTask.get();
@@ -362,7 +365,8 @@ public void shouldNotRecordProposedBadBlockToBadBlockManager()
         System.currentTimeMillis() / 1000,
         Bytes32.ZERO,
         suggestedFeeRecipient,
-        Optional.empty(), Optional.empty());
+        Optional.empty(),
+        Optional.empty());
 
     verify(badBlockManager, never()).addBadBlock(any(), any());
     assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
@@ -394,7 +398,8 @@ public void shouldContinueBuildingBlocksUntilFinalizeIsCalled()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     blockCreationTask.get();
 
@@ -445,7 +450,8 @@ public void blockCreationRepetitionShouldTakeNotLessThanRepetitionMinDuration()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     blockCreationTask.get();
 
@@ -491,7 +497,8 @@ public void shouldRetryBlockCreationOnRecoverableError()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     blockCreationTask.get();
 
@@ -525,7 +532,8 @@ public void shouldStopRetryBlockCreationIfTimeExpired() throws InterruptedExcept
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     try {
       blockCreationTask.get();
@@ -567,7 +575,8 @@ public void shouldStopInProgressBlockCreationIfFinalizedIsCalled()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     waitForBlockCreationInProgress.await();
     coordinator.finalizeProposalById(payloadId);
@@ -613,7 +622,8 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload
             timestamp,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     final CompletableFuture<Void> task1 = blockCreationTask;
 
@@ -623,7 +633,8 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload
             timestamp,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     assertThat(payloadId1).isEqualTo(payloadId2);
 
@@ -658,7 +669,8 @@ public void shouldCancelPreviousBlockCreationJobIfCalledAgainWithNewPayloadId()
             timestamp,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     assertThat(coordinator.isBlockCreationCancelled(payloadId1)).isFalse();
 
@@ -668,7 +680,8 @@ public void shouldCancelPreviousBlockCreationJobIfCalledAgainWithNewPayloadId()
             timestamp + 1,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     assertThat(payloadId1).isNotEqualTo(payloadId2);
     assertThat(coordinator.isBlockCreationCancelled(payloadId1)).isTrue();
@@ -697,7 +710,8 @@ public void shouldUseExtraDataFromMiningParameters() {
             1L,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            Optional.empty(), Optional.empty());
+            Optional.empty(),
+            Optional.empty());
 
     ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
         ArgumentCaptor.forClass(BlockWithReceipts.class);

diff --git a/...integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java b/...integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java
@@ -129,7 +129,8 @@ public JsonRpcResponse response(
             withdrawalsRoot,
             null, // ToDo 4844: set with the value of data_gas_used field
             null, // ToDo 4844: set with the value of excess_data_gas field
-                null, depositsRoot,
+            null,
+            depositsRoot,
             blockHeaderFunctions);
 
     return new JsonRpcSuccessResponse(

diff --git a/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -115,7 +115,8 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
       return respondWithInvalid(reqId, blockParam, null, INVALID, "Invalid versionedHash");
     }
 
-    Optional<String> maybeParentBeaconBlockRootParam = requestContext.getOptionalParameter(2, String.class);
+    Optional<String> maybeParentBeaconBlockRootParam =
+        requestContext.getOptionalParameter(2, String.class);
 
     final Optional<BlockHeader> maybeParentHeader =
         protocolContext.getBlockchain().getBlockHeader(blockParam.getParentHash());

diff --git a/...edger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameter.java b/...edger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameter.java
@@ -34,16 +34,17 @@ public class EnginePayloadAttributesParameter {
 
   @JsonCreator
   public EnginePayloadAttributesParameter(
-          @JsonProperty("timestamp") final String timestamp,
-          @JsonProperty("prevRandao") final String prevRandao,
-          @JsonProperty("suggestedFeeRecipient") final String suggestedFeeRecipient,
-          @JsonProperty("withdrawals") final List<WithdrawalParameter> withdrawals,
-          @JsonProperty("parentBeaconBlockRoot") final String parentBeaconBlockRoot) {
+      @JsonProperty("timestamp") final String timestamp,
+      @JsonProperty("prevRandao") final String prevRandao,
+      @JsonProperty("suggestedFeeRecipient") final String suggestedFeeRecipient,
+      @JsonProperty("withdrawals") final List<WithdrawalParameter> withdrawals,
+      @JsonProperty("parentBeaconBlockRoot") final String parentBeaconBlockRoot) {
     this.timestamp = Long.decode(timestamp);
     this.prevRandao = Bytes32.fromHexString(prevRandao);
     this.suggestedFeeRecipient = Address.fromHexString(suggestedFeeRecipient);
     this.withdrawals = withdrawals;
-    this.parentBeaconBlockRoot = parentBeaconBlockRoot == null ? null : Bytes32.fromHexString(parentBeaconBlockRoot);
+    this.parentBeaconBlockRoot =
+        parentBeaconBlockRoot == null ? null : Bytes32.fromHexString(parentBeaconBlockRoot);
   }
 
   public Long getTimestamp() {

diff --git a/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java b/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java
@@ -110,7 +110,8 @@ public PayloadResult(
       this.dataGasUsed = header.getDataGasUsed().map(Quantity::create).orElse(Quantity.HEX_ZERO);
       this.excessDataGas =
           header.getExcessDataGas().map(Quantity::create).orElse(Quantity.HEX_ZERO);
-      this.parentBeaconBlockRoot = header.getParentBeaconBlockRoot().map(Bytes32::toHexString).orElse(null);
+      this.parentBeaconBlockRoot =
+          header.getParentBeaconBlockRoot().map(Bytes32::toHexString).orElse(null);
     }
 
     @JsonGetter(value = "blockNumber")

diff --git a/...test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java b/...test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java
@@ -164,7 +164,8 @@ private Object createFakeBlock(final Long height) {
                 null,
                 null,
                 null,
-                    null, null,
+                null,
+                null,
                 null),
             new BlockBody(
                 List.of(
@@ -205,7 +206,8 @@ private Object createEmptyBlock(final Long height) {
                 null,
                 null,
                 null,
-                    null, null,
+                null,
+                null,
                 null),
             new BlockBody(List.of(), List.of())));
   }