Fix unit tests

Signed-off-by: Fabio Di Fabio <[email protected]>

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -21,6 +21,7 @@
 import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
+import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATED_AND_USELESS_WARNING_MSG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
 import static org.hyperledger.besu.config.experimental.MergeConfigOptions.isMergeEnabled;
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
@@ -1824,8 +1825,11 @@ private void issueOptionWarnings() {
       logger.warn(
           DEPRECATION_WARNING_MSG,
           "--privacy-onchain-groups-enabled",
-          "--privacy-flexible-groups-enabled",
-          "--tx-pool-hashes-max-size");
+          "--privacy-flexible-groups-enabled");
+    }
+
+    if (pooledTransactionHashesSize != null) {
+      logger.warn(DEPRECATED_AND_USELESS_WARNING_MSG, "--tx-pool-hashes-max-size");
     }
   }
 

besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java

@@ -29,6 +29,8 @@ public class CommandLineUtils {
   public static final String MULTI_DEPENDENCY_WARNING_MSG =
       "{} ignored because none of {} was defined.";
   public static final String DEPRECATION_WARNING_MSG = "{} has been deprecated, use {} instead.";
+  public static final String DEPRECATED_AND_USELESS_WARNING_MSG =
+      "{} has been deprecated and is now useless, remove it.";
 
   /**
    * Check if options are passed that require an option to be true to have any effect and log a

besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java

@@ -26,6 +26,7 @@
 import static org.hyperledger.besu.cli.config.NetworkName.RINKEBY;
 import static org.hyperledger.besu.cli.config.NetworkName.ROPSTEN;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
+import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATED_AND_USELESS_WARNING_MSG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ENGINE;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH;
@@ -3884,6 +3885,13 @@ public void onchainPrivacyGroupEnabledOptionIsDeprecated() {
             "--privacy-flexible-groups-enabled");
   }
 
+  @Test
+  public void txPoolHashesMaxSizeOptionIsDeprecated() {
+    parseCommand("--tx-pool-hashes-max-size", "1024");
+
+    verify(mockLogger).warn(DEPRECATED_AND_USELESS_WARNING_MSG, "--tx-pool-hashes-max-size");
+  }
+
   @Test
   public void flexiblePrivacyGroupEnabledFlagValueIsSet() {
     parseCommand(

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcaster.java

@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -54,12 +55,13 @@ public TransactionBroadcaster(
   }
 
   public void handlePeerConnection(final EthPeer peer) {
-    if (peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)) {
-      sendTransactionHashes(
-          toTransactionList(pendingTransactions.getTransactionInfo()), List.of(peer));
-    } else {
-      sendFullTransactions(
-          toTransactionList(pendingTransactions.getTransactionInfo()), List.of(peer));
+    Set<TransactionInfo> pendingTransactionInfo = pendingTransactions.getTransactionInfo();
+    if (!pendingTransactionInfo.isEmpty()) {
+      if (peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)) {
+        sendTransactionHashes(toTransactionList(pendingTransactionInfo), List.of(peer));
+      } else {
+        sendFullTransactions(toTransactionList(pendingTransactionInfo), List.of(peer));
+      }
     }
   }
 

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java

@@ -145,7 +145,7 @@ public void addRemoteTransactions(final Collection<Transaction> transactions) {
     if (!syncState.isInSync(SYNC_TOLERANCE)) {
       return;
     }
-    final Set<Transaction> addedTransactions = new HashSet<>();
+    final Set<Transaction> addedTransactions = new HashSet<>(transactions.size());
     for (final Transaction transaction : transactions) {
       if (pendingTransactions.containsTransaction(transaction.getHash())) {
         // We already have this transaction, don't even validate it.

ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java

@@ -70,8 +70,6 @@ public void testDisconnect() {
     when(ethContext.getEthMessages()).thenReturn(mock(EthMessages.class));
     when(ethContext.getEthPeers()).thenReturn(ethPeers);
     final EthScheduler ethScheduler = mock(EthScheduler.class);
-    final ArgumentCaptor<Runnable> sendTaskCapture = ArgumentCaptor.forClass(Runnable.class);
-    doNothing().when(ethScheduler).scheduleSyncWorkerTask(sendTaskCapture.capture());
     when(ethContext.getScheduler()).thenReturn(ethScheduler);
     final SyncState state = mock(SyncState.class);
     final GasPricePendingTransactionsSorter pendingTransactions =
@@ -122,9 +120,7 @@ public void testDisconnect() {
         RespondingEthPeer.builder().ethProtocolManager(ethProtocolManager).build();
     assertThat(ethPeer.getEthPeer()).isNotNull();
     assertThat(ethPeer.getEthPeer().isDisconnected()).isFalse();
-    sendTaskCapture.getValue().run();
     ethPeer.disconnect(DisconnectMessage.DisconnectReason.CLIENT_QUITTING);
-    verify(transactionsMessageSender).sendTransactionsToPeer(ethPeer.getEthPeer());
     verify(peerTransactionTracker, times(1)).onDisconnect(ethPeer.getEthPeer());
   }
 }

ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java

@@ -27,7 +27,6 @@
 import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 
-import com.google.common.collect.ImmutableSet;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -57,7 +56,7 @@ public void shouldMarkAllReceivedTransactionsAsSeen() {
         ofMinutes(1));
 
     verify(transactionTracker)
-        .markTransactionsAsSeen(peer1, ImmutableSet.of(transaction1, transaction2, transaction3));
+        .markTransactionsAsSeen(peer1, asList(transaction1, transaction2, transaction3));
   }
 
   @Test
@@ -67,8 +66,7 @@ public void shouldAddReceivedTransactionsToTransactionPool() {
         TransactionsMessage.create(asList(transaction1, transaction2, transaction3)),
         now(),
         ofMinutes(1));
-    verify(transactionPool)
-        .addRemoteTransactions(ImmutableSet.of(transaction1, transaction2, transaction3));
+    verify(transactionPool).addRemoteTransactions(asList(transaction1, transaction2, transaction3));
   }
 
   @Test