Update existed tests

Signed-off-by: Navie Chan <[email protected]>
ensi321 · Feb 20, 2023 · 91a851f · 91a851f
1 parent 2e68cca
commit 91a851f
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 17 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
@@ -194,7 +194,7 @@ private void setSyncTarget() {
         mock(EthPeer.class),
         new org.hyperledger.besu.ethereum.core.BlockHeader(
             null, null, null, null, null, null, null, null, 1, 1, 1, 1, null, null, null, 1, null,
-            null, null));
+            null, null, null));
   }
 
   private void clearSyncTarget() {

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
@@ -57,6 +57,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
@@ -115,6 +116,7 @@ public class MergeCoordinatorTest implements MergeGenesisConfigHelper {
   private static final KeyPair KEYS1 =
       new KeyPair(PRIVATE_KEY1, SIGNATURE_ALGORITHM.get().createPublicKey(PRIVATE_KEY1));
   private static final Optional<List<Withdrawal>> EMPTY_WITHDRAWALS = Optional.empty();
+  private static final Optional<List<Deposit>> EMPTY_DEPOSITS = Optional.empty();
 
   private static final long REPETITION_MIN_DURATION = 100;
   @Mock MergeContext mergeContext;
@@ -225,7 +227,8 @@ public void coinbaseShouldMatchSuggestedFeeRecipient() {
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
-            EMPTY_WITHDRAWALS);
+            EMPTY_WITHDRAWALS,
+            EMPTY_DEPOSITS);
 
     ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
         ArgumentCaptor.forClass(BlockWithReceipts.class);
@@ -263,7 +266,8 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid()
               .doThrow(new MerkleTrieException("missing leaf"))
               .doCallRealMethod()
               .when(beingSpiedOn)
-              .createBlock(any(), any(Bytes32.class), anyLong(), eq(Optional.empty()));
+              .createBlock(
+                  any(), any(Bytes32.class), anyLong(), eq(Optional.empty()), eq(Optional.empty()));
           return beingSpiedOn;
         };
 
@@ -299,6 +303,7 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid()
             System.currentTimeMillis() / 1000,
             Bytes32.random(),
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     verify(willThrow, never()).addBadBlock(any(), any());
@@ -343,6 +348,7 @@ public void shouldContinueBuildingBlocksUntilFinalizeIsCalled()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -394,6 +400,7 @@ public void blockCreationRepetitionShouldTakeNotLessThanRepetitionMinDuration()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -439,6 +446,7 @@ public void shouldRetryBlockCreationOnRecoverableError()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     blockCreationTask.get();
@@ -473,6 +481,7 @@ public void shouldStopRetryBlockCreationIfTimeExpired() throws InterruptedExcept
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     try {
@@ -515,6 +524,7 @@ public void shouldStopInProgressBlockCreationIfFinalizedIsCalled()
             System.currentTimeMillis() / 1000,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     waitForBlockCreationInProgress.await();
@@ -561,6 +571,7 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload
             timestamp,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     final CompletableFuture<Void> task1 = blockCreationTask;
@@ -571,6 +582,7 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload
             timestamp,
             Bytes32.ZERO,
             suggestedFeeRecipient,
+            Optional.empty(),
             Optional.empty());
 
     assertThat(payloadId1).isEqualTo(payloadId2);

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
@@ -163,6 +163,7 @@ private Object createFakeBlock(final Long height) {
                 0,
                 null,
                 null,
+                null,
                 null),
             new BlockBody(
                 List.of(
@@ -202,6 +203,7 @@ private Object createEmptyBlock(final Long height) {
                 0,
                 null,
                 null,
+                null,
                 null),
             new BlockBody(List.of(), List.of())));
   }

diff --git a/.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
@@ -114,6 +114,8 @@ public class EthGetTransactionReceiptTest {
           Optional.of(PoWHasher.ETHASH_LIGHT),
           null,
           Optional.empty(),
+          null,
+          Optional.empty(),
           true);
   private final ProtocolSpec statusTransactionTypeSpec =
       new ProtocolSpec(
@@ -142,6 +144,8 @@ public class EthGetTransactionReceiptTest {
           Optional.of(PoWHasher.ETHASH_LIGHT),
           null,
           Optional.empty(),
+          null,
+          Optional.empty(),
           true);
 
   @SuppressWarnings("unchecked")

diff --git a/...esu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java b/...esu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
@@ -255,6 +255,7 @@ public void shouldReturnValidWithoutFinalizedWithPayload() {
             payloadParams.getTimestamp(),
             payloadParams.getPrevRandao(),
             Address.ECREC,
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 
@@ -441,7 +442,7 @@ public void shouldIgnoreUpdateToOldHeadAndNotPreparePayload() {
 
     var forkchoiceRes = (EngineUpdateForkchoiceResult) resp.getResult();
 
-    verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any());
+    verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any(), any());
 
     assertThat(forkchoiceRes.getPayloadStatus().getStatus()).isEqualTo(VALID);
     assertThat(forkchoiceRes.getPayloadStatus().getError()).isNull();
@@ -528,6 +529,7 @@ public void shouldReturnValidIfWithdrawalsIsNull_WhenWithdrawalsProhibited() {
             payloadParams.getTimestamp(),
             payloadParams.getPrevRandao(),
             Address.ECREC,
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 
@@ -606,7 +608,8 @@ public void shouldReturnValidIfWithdrawalsIsNotNull_WhenWithdrawalsAllowed() {
             Optional.of(
                 withdrawals.stream()
                     .map(WithdrawalParameter::toWithdrawal)
-                    .collect(Collectors.toList()))))
+                    .collect(Collectors.toList())),
+            Optional.empty()))
         .thenReturn(mockPayloadId);
 
     assertSuccessWithPayloadForForkchoiceResult(
@@ -645,6 +648,7 @@ public void shouldReturnValidIfTimestampScheduleIsEmpty() {
             payloadParams.getTimestamp(),
             payloadParams.getPrevRandao(),
             Address.ECREC,
+            Optional.empty(),
             Optional.empty()))
         .thenReturn(mockPayloadId);
 

diff --git a/...edger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java b/...edger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java
@@ -85,7 +85,8 @@ public AbstractEngineGetPayloadTest(final MethodFactory methodFactory) {
           new BlockBody(
               Collections.emptyList(),
               Collections.emptyList(),
-              Optional.of(Collections.emptyList())));
+              Optional.of(Collections.emptyList()),
+              Optional.empty()));
   protected static final BlockWithReceipts mockBlockWithReceiptsAndWithdrawals =
       new BlockWithReceipts(mockBlockWithWithdrawals, Collections.emptyList());
 

diff --git a/...hereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java b/...hereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java
@@ -251,6 +251,7 @@ private BlockHeader createBlockHeader(final Hash blockHash, final long blockNumb
         0,
         null,
         null,
+        null,
         new BlockHeaderFunctions() {
           @Override
           public Hash hash(final BlockHeader header) {

diff --git a/...besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java b/...besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java
@@ -177,6 +177,7 @@ public void shouldReturnWithdrawalNullWhenBlockIsPreShanghai() {
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
+            Optional.empty(),
             Optional.empty());
     when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(preShanghaiBlockBody));
     when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(preShanghaiBlockBody2));
@@ -207,13 +208,15 @@ public void shouldReturnWithdrawalsWhenBlockIsPostShanghai() {
                 new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
                 new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal)));
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
 
     final BlockBody shanghaiBlockBody2 =
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal2)));
+            Optional.of(List.of(withdrawal2)),
+            Optional.empty());
     when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
     when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2));
 

diff --git a/...esu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java b/...esu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java
@@ -176,6 +176,7 @@ public void shouldReturnNullForWithdrawalsWhenBlockIsPreShanghai() {
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
+            Optional.empty(),
             Optional.empty());
     when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
     when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(preShanghaiBlockBody));
@@ -210,13 +211,15 @@ public void shouldReturnWithdrawalsWhenBlockIsPostShanghai() {
                 new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
                 new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal)));
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
 
     final BlockBody shanghaiBlockBody2 =
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal2)));
+            Optional.of(List.of(withdrawal2)),
+            Optional.empty());
     when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
     when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
     when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2));
@@ -246,7 +249,8 @@ public void shouldNotContainTrailingNullForBlocksPastTheCurrentHead() {
                 new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
                 new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal)));
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
     when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(123));
     when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
     when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
@@ -269,17 +273,20 @@ public void shouldReturnUpUntilHeadWhenStartBlockPlusCountEqualsHeadNumber() {
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal)));
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
     final BlockBody shanghaiBlockBody2 =
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal)));
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
     final BlockBody shanghaiBlockBody3 =
         new BlockBody(
             List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
             Collections.emptyList(),
-            Optional.of(List.of(withdrawal)));
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
     when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(125));
     when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
     when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2));

diff --git a/.../src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java b/.../src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java
@@ -112,6 +112,7 @@ public void setup() {
             0,
             null,
             null,
+            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     final BlockBody fakeBody = new BlockBody(Collections.emptyList(), Collections.emptyList());

diff --git a/.../org/hyperledger/besu/ethereum/api/query/GoQuorumPrivateTxBloomBlockchainQueriesTest.java b/.../org/hyperledger/besu/ethereum/api/query/GoQuorumPrivateTxBloomBlockchainQueriesTest.java
@@ -94,6 +94,7 @@ public void setup() {
             0,
             null,
             null,
+            null,
             new MainnetBlockHeaderFunctions(),
             Optional.of(testLogsBloomFilter));
     testHash = fakeHeader.getHash();

diff --git a/...perledger/besu/ethereum/api/query/cache/GoQuorumPrivateTransactionLogBloomCacherTest.java b/...perledger/besu/ethereum/api/query/cache/GoQuorumPrivateTransactionLogBloomCacherTest.java
@@ -170,6 +170,7 @@ private BlockHeader createBlock(final long number) {
             0,
             null,
             null,
+            null,
             new MainnetBlockHeaderFunctions(),
             Optional.of(testLogsBloomFilter));
     return fakeHeader;

diff --git a/...est/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java b/...est/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java
@@ -102,6 +102,7 @@ public void setup() throws IOException {
             0,
             null,
             null,
+            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     when(blockchain.getBlockHeader(anyLong())).thenReturn(Optional.of(fakeHeader));
@@ -268,6 +269,7 @@ private BlockHeader createBlock(final long number, final Optional<String> messag
             0,
             null,
             null,
+            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     when(blockchain.getBlockHeader(number)).thenReturn(Optional.of(fakeHeader));

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
@@ -70,7 +70,13 @@ void withProcessorAndEmptyWithdrawals_NoWithdrawalsAreProcessed() {
     final AbstractBlockCreator blockCreator = blockCreatorWithWithdrawalsProcessor();
     final BlockCreationResult blockCreationResult =
         blockCreator.createBlock(
-            Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1L, false);
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            1L,
+            false);
     verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
     assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
@@ -81,7 +87,13 @@ void withNoProcessorAndEmptyWithdrawals_NoWithdrawalsAreNotProcessed() {
     final AbstractBlockCreator blockCreator = blockCreatorWithoutWithdrawalsProcessor();
     final BlockCreationResult blockCreationResult =
         blockCreator.createBlock(
-            Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1L, false);
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            1L,
+            false);
     verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
     assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
     assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
@@ -98,6 +110,7 @@ void withProcessorAndWithdrawals_WithdrawalsAreProcessed() {
             Optional.empty(),
             Optional.of(withdrawals),
             Optional.empty(),
+            Optional.empty(),
             1L,
             false);
 
@@ -119,6 +132,7 @@ void withNoProcessorAndWithdrawals_WithdrawalsAreNotProcessed() {
             Optional.empty(),
             Optional.of(withdrawals),
             Optional.empty(),
+            Optional.empty(),
             1L,
             false);
     verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());

diff --git a/...c/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java b/...c/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java
@@ -74,7 +74,7 @@ public void assertBodyIdentifierUsesWithdrawalsToGenerateBodyIdentifiers() {
     final BlockBody emptyBodyBlock = BlockBody.empty();
     // Block with no tx, no ommers, 1 withdrawal
     final BlockBody bodyBlockWithWithdrawal =
-        new BlockBody(emptyList(), emptyList(), Optional.of(List.of(withdrawal)));
+        new BlockBody(emptyList(), emptyList(), Optional.of(List.of(withdrawal)), Optional.empty());
 
     assertThat(
             new GetBodiesFromPeerTask.BodyIdentifier(emptyBodyBlock)

diff --git a/...reum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java b/...reum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java
@@ -330,6 +330,7 @@ public TestBlockHeader(
           Bytes.fromHexStringLenient(nonce).toLong(),
           null,
           null,
+          null,
           new MainnetBlockHeaderFunctions());
     }
   }