Merge branch 'main' into zkbesu

# Conflicts: # ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java
Consensys · Sep 27, 2024 · 3cd409f · 3cd409f
2 parents bf57363 + f9695c1
commit 3cd409f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...ava/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java b/...ava/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java
@@ -218,7 +218,8 @@ private void timeLimitedSelection() {
   private void cancelEvaluatingTxWithGraceTime(final FutureTask<Void> txSelectionTask) {
     final long elapsedTime =
         currTxEvaluationContext.getEvaluationTimer().elapsed(TimeUnit.MILLISECONDS);
-    final long txRemainingTime = blockTxsSelectionMaxTime - elapsedTime;
+    // adding 100ms so we are sure it take strictly more than the block selection max time
+    final long txRemainingTime = (blockTxsSelectionMaxTime - elapsedTime) + 100;
 
     LOG.atDebug()
         .setMessage(

diff --git a/...ava/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java b/...ava/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@@ -107,7 +107,6 @@
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -956,7 +955,6 @@ public void subsetOfPendingTransactionsIncludedWhenTxSelectionMaxTimeIsOver(
         false);
   }
 
-  @Disabled
   @ParameterizedTest
   @MethodSource("subsetOfPendingTransactionsIncludedWhenTxSelectionMaxTimeIsOver")
   public void pendingTransactionsThatTakesTooLongToEvaluateIsPenalized(
@@ -1107,7 +1105,6 @@ public void subsetOfInvalidPendingTransactionsIncludedWhenTxSelectionMaxTimeIsOv
         NONCE_TOO_LOW);
   }
 
-  @Disabled
   @ParameterizedTest
   @MethodSource("subsetOfPendingTransactionsIncludedWhenTxSelectionMaxTimeIsOver")
   public void