fix: test compile

optimism-java · Jul 21, 2024 · a82b2b1 · a82b2b1
1 parent 6e0e364
commit a82b2b1
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 24 deletions.
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
@@ -247,6 +247,9 @@ public void coinbaseShouldMatchSuggestedFeeRecipient() {
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     ArgumentCaptor<PayloadWrapper> payloadWrapper = ArgumentCaptor.forClass(PayloadWrapper.class);
@@ -322,6 +325,9 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid()
             Bytes32.random(),
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -360,6 +366,9 @@ public void shouldNotRecordProposedBadBlockToBadBlockManager()
         Bytes32.ZERO,
         suggestedFeeRecipient,
         Optional.empty(),
+        Optional.empty(),
+        Optional.empty(),
+        Optional.empty(),
         Optional.empty());
 
     verify(badBlockManager, never()).addBadBlock(any(), any());
@@ -393,6 +402,9 @@ public void shouldContinueBuildingBlocksUntilFinalizeIsCalled()
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -451,6 +463,9 @@ public void blockCreationRepetitionShouldTakeNotLessThanRepetitionMinDuration()
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -502,6 +517,9 @@ public void shouldRetryBlockCreationOnRecoverableError()
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -555,6 +573,9 @@ public void shouldStopRetryBlockCreationIfTimeExpired() throws InterruptedExcept
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     try {
@@ -601,6 +622,9 @@ public void shouldStopInProgressBlockCreationIfFinalizedIsCalled()
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     waitForBlockCreationInProgress.await();
@@ -655,6 +679,9 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     final CompletableFuture<Void> task1 = blockCreationTask;
@@ -666,6 +693,9 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     assertThat(payloadId1).isEqualTo(payloadId2);
@@ -707,6 +737,9 @@ public void shouldCancelPreviousBlockCreationJobIfCalledAgainWithNewPayloadId()
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     assertThat(coordinator.isBlockCreationCancelled(payloadId1)).isFalse();
@@ -718,6 +751,9 @@ public void shouldCancelPreviousBlockCreationJobIfCalledAgainWithNewPayloadId()
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     assertThat(payloadId1).isNotEqualTo(payloadId2);
@@ -751,6 +787,9 @@ public void shouldUseExtraDataFromMiningParameters() {
             Bytes32.ZERO,
             suggestedFeeRecipient,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty());
 
     ArgumentCaptor<PayloadWrapper> payloadWrapper = ArgumentCaptor.forClass(PayloadWrapper.class);

diff --git a/...esu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java b/...esu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
@@ -41,6 +41,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EngineForkchoiceUpdatedParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePayloadAttributesParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedLongParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -241,7 +242,10 @@ public void shouldReturnValidWithoutFinalizedWithPayload() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             null,
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
     var mockPayloadId =
         PayloadIdentifier.forPayloadParams(
             mockHeader.getHash(),
@@ -257,6 +261,9 @@ public void shouldReturnValidWithoutFinalizedWithPayload() {
             payloadParams.getPrevRandao(),
             Address.ECREC,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 
@@ -430,7 +437,10 @@ public void shouldIgnoreUpdateToOldHeadAndNotPreparePayload() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             null,
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
 
     var resp =
         (JsonRpcSuccessResponse)
@@ -441,7 +451,7 @@ public void shouldIgnoreUpdateToOldHeadAndNotPreparePayload() {
 
     var forkchoiceRes = (EngineUpdateForkchoiceResult) resp.getResult();
 
-    verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any(), any());
+    verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any(), any(), any(), any(), any());
 
     assertThat(forkchoiceRes.getPayloadStatus().getStatus()).isEqualTo(VALID);
     assertThat(forkchoiceRes.getPayloadStatus().getError()).isNull();
@@ -467,7 +477,10 @@ public void shouldReturnInvalidIfPayloadTimestampNotGreaterThanHead() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             emptyList(),
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
 
     var resp =
         resp(
@@ -492,7 +505,10 @@ public void shouldReturnInvalidIfWithdrawalsIsNotNull_WhenWithdrawalsProhibited(
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             emptyList(),
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
 
     var resp =
         resp(
@@ -517,7 +533,10 @@ public void shouldReturnValidIfWithdrawalsIsNull_WhenWithdrawalsProhibited() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             null,
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
 
     var mockPayloadId =
         PayloadIdentifier.forPayloadParams(
@@ -534,6 +553,9 @@ public void shouldReturnValidIfWithdrawalsIsNull_WhenWithdrawalsProhibited() {
             payloadParams.getPrevRandao(),
             Address.ECREC,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 
@@ -561,7 +583,10 @@ public void shouldReturnInvalidIfWithdrawalsIsNull_WhenWithdrawalsAllowed() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             null,
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
 
     var resp =
         resp(
@@ -597,7 +622,7 @@ public void shouldReturnValidIfWithdrawalsIsNotNull_WhenWithdrawalsAllowed() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             withdrawalParameters,
-            null);
+            null, null, null, new UnsignedLongParameter(0L));
 
     final Optional<List<Withdrawal>> withdrawals =
         Optional.of(
@@ -620,6 +645,9 @@ public void shouldReturnValidIfWithdrawalsIsNotNull_WhenWithdrawalsAllowed() {
             payloadParams.getPrevRandao(),
             Address.ECREC,
             withdrawals,
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 
@@ -646,7 +674,10 @@ public void shouldReturnValidIfProtocolScheduleIsEmpty() {
             Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
             Address.ECREC.toString(),
             null,
-            null);
+            null,
+            null,
+            null,
+            new UnsignedLongParameter(0L));
 
     var mockPayloadId =
         PayloadIdentifier.forPayloadParams(
@@ -663,6 +694,9 @@ public void shouldReturnValidIfProtocolScheduleIsEmpty() {
             payloadParams.getPrevRandao(),
             Address.ECREC,
             Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 

diff --git a/...r/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java b/...r/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
@@ -98,13 +98,13 @@ public void serialize_WithdrawalsPresent() {
 
   private EnginePayloadAttributesParameter parameterWithdrawalsOmitted() {
     return new EnginePayloadAttributesParameter(
-        TIMESTAMP, PREV_RANDAO, SUGGESTED_FEE_RECIPIENT_ADDRESS, null, null);
+        TIMESTAMP, PREV_RANDAO, SUGGESTED_FEE_RECIPIENT_ADDRESS, null, null, null, null, new UnsignedLongParameter(0L));
   }
 
   private EnginePayloadAttributesParameter parameterWithdrawalsPresent() {
     final List<WithdrawalParameter> withdrawals = List.of(WITHDRAWAL_PARAM_1, WITHDRAWAL_PARAM_2);
     return new EnginePayloadAttributesParameter(
-        TIMESTAMP, PREV_RANDAO, SUGGESTED_FEE_RECIPIENT_ADDRESS, withdrawals, null);
+        TIMESTAMP, PREV_RANDAO, SUGGESTED_FEE_RECIPIENT_ADDRESS, withdrawals, null, null, null, new UnsignedLongParameter(0L));
   }
 
   // TODO: add a parent beacon block root test here

diff --git a/...n/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java b/...n/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
@@ -152,7 +152,9 @@ void withAllowedDepositRequestsAndContractAddress_DepositRequestsAreParsed() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
 
     List<Request> depositRequests = emptyList();
     final Hash requestsRoot = BodyValidation.requestsRoot(depositRequests);
@@ -172,7 +174,9 @@ void withAllowedDepositRequestsAndNoContractAddress_DepositRequestsAreNotParsed(
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
 
     assertThat(blockCreationResult.getBlock().getHeader().getRequestsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getRequests()).isEmpty();
@@ -190,7 +194,9 @@ void withProhibitedDepositRequests_DepositRequestsAreNotParsed() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
 
     assertThat(blockCreationResult.getBlock().getHeader().getRequestsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getRequests()).isEmpty();
@@ -235,7 +241,9 @@ void withProcessorAndEmptyWithdrawals_NoWithdrawalsAreProcessed() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
     verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
     assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
@@ -252,7 +260,9 @@ void withNoProcessorAndEmptyWithdrawals_NoWithdrawalsAreNotProcessed() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
     verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
     assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
@@ -271,7 +281,9 @@ void withProcessorAndWithdrawals_WithdrawalsAreProcessed() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
 
     final Hash withdrawalsRoot = BodyValidation.withdrawalsRoot(withdrawals);
     verify(withdrawalsProcessor).processWithdrawals(eq(withdrawals), any());
@@ -293,7 +305,9 @@ void withNoProcessorAndWithdrawals_WithdrawalsAreNotProcessed() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
     verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
     assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
@@ -326,7 +340,9 @@ public void computesGasUsageFromIncludedTransactions() {
             Optional.empty(),
             Optional.empty(),
             1L,
-            false);
+            false,
+            Optional.empty(),
+            Optional.empty());
     long blobGasUsage = blockCreationResult.getBlock().getHeader().getGasUsed();
     assertThat(blobGasUsage).isNotZero();
     BlobGas excessBlobGas = blockCreationResult.getBlock().getHeader().getExcessBlobGas().get();

diff --git a/...ava/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java b/...ava/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@@ -1274,7 +1274,8 @@ protected BlockTransactionSelector createBlockSelector(
             GasLimitCalculator.constant(),
             protocolSchedule.getByBlockHeader(blockHeader).getBlockHashProcessor(),
             transactionSelectionService.createPluginTransactionSelector(),
-            ethScheduler);
+            ethScheduler,
+            Optional.empty());
 
     return selector;
   }