shouldEvictMultipleOldTransactions

ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactions.java

@@ -13,6 +13,7 @@
 package tech.pegasys.pantheon.ethereum.eth.transactions;
 
 import static java.util.Comparator.comparing;
+import static java.util.stream.Collectors.toList;
 
 import tech.pegasys.pantheon.ethereum.core.AccountTransactionOrder;
 import tech.pegasys.pantheon.ethereum.core.Address;
@@ -104,13 +105,16 @@ public PendingTransactions(
     timerUtil.setPeriodic(transactionEvictionIntervalMs, this::evictOldTransactions);
   }
 
-  private void evictOldTransactions() {
+  private boolean filterStream(TransactionInfo transaction) {
     final long now = System.currentTimeMillis();
-    for (Map.Entry<Hash, TransactionInfo> transaction : pendingTransactions.entrySet()) {
-      final long then = transaction.getValue().getAddedToPoolAt().getEpochSecond();
-      if (now - then > transactionEvictionIntervalMs) {
-        removeTransaction(transaction.getValue().getTransaction());
-      }
+    return now - transaction.getAddedToPoolAt().getEpochSecond() > transactionEvictionIntervalMs;
+  }
+
+  private void evictOldTransactions() {
+    synchronized (pendingTransactions) {
+      final List<TransactionInfo> transactionsToRemove =
+          prioritizedTransactions.stream().filter(this::filterStream).collect(toList());
+      transactionsToRemove.forEach(transaction -> removeTransaction(transaction.getTransaction()));
     }
   }
 

ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionsTest.java

@@ -425,7 +425,7 @@ private Transaction createTransaction(final int transactionNumber) {
   }
 
   @Test
-  public void shouldEvictOldTransactions() {
+  public void shouldEvictSingleOldTransaction() {
     final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.SECONDS.toMillis(1);
     final PendingTransactions transactions =
         new PendingTransactions(
@@ -442,4 +442,27 @@ public void shouldEvictOldTransactions() {
     }
     assertThat(transactions.size()).isEqualTo(0);
   }
+
+  @Test
+  public void shouldEvictMultipleOldTransactions() {
+    final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.SECONDS.toMillis(1);
+    final PendingTransactions transactions =
+        new PendingTransactions(
+            timerUtil,
+            TRANSACTION_EVICTION_INTERVAL_MS,
+            MAX_TRANSACTIONS,
+            TestClock.fixed(),
+            metricsSystem);
+
+    transactions.addRemoteTransaction(transaction1);
+    assertThat(transactions.size()).isEqualTo(1);
+    transactions.addRemoteTransaction(transaction2);
+    assertThat(transactions.size()).isEqualTo(2);
+
+    try {
+      TimeUnit.SECONDS.sleep(2);
+    } catch (Exception ignored) {
+    }
+    assertThat(transactions.size()).isEqualTo(0);
+  }
 }