Merge branch 'main' into trie-log-pruning-take2

Signed-off-by: Simon Dudley <[email protected]>
siladu · Oct 25, 2023 · d007a2c · d007a2c
2 parents def2160 + 20f518e
commit d007a2c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...ava/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java b/...ava/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java
@@ -27,8 +27,10 @@
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,20 +40,20 @@ public class GetPooledTransactionsFromPeerTask extends AbstractPeerRequestTask<L
   private static final Logger LOG =
       LoggerFactory.getLogger(GetPooledTransactionsFromPeerTask.class);
 
-  private final List<Hash> hashes;
+  private final Set<Hash> hashes;
 
   private GetPooledTransactionsFromPeerTask(
       final EthContext ethContext, final List<Hash> hashes, final MetricsSystem metricsSystem) {
     super(ethContext, EthPV65.GET_POOLED_TRANSACTIONS, metricsSystem);
-    this.hashes = List.copyOf(hashes);
+    this.hashes = new HashSet<>(hashes);
   }
 
   public static GetPooledTransactionsFromPeerTask forHashes(
       final EthContext ethContext, final List<Hash> hashes, final MetricsSystem metricsSystem) {
     return new GetPooledTransactionsFromPeerTask(ethContext, hashes, metricsSystem);
   }
 
-  public List<Hash> getTransactionHashes() {
+  public Set<Hash> getTransactionHashes() {
     return hashes;
   }
 
@@ -60,7 +62,7 @@ protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
           LOG.debug("Requesting {} transaction pool entries from peer {}.", hashes.size(), peer);
-          return peer.getPooledTransactions(hashes);
+          return peer.getPooledTransactions(new ArrayList<>(hashes));
         },
         0);
   }