[MINOR] nuke those extra ellipses (hyperledger#6870)

* no extra ellipses Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * no extra ellipses Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * spurious semicolon Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * duplicated word Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
Citi · Apr 16, 2024 · b824ba8 · b824ba8
1 parent 9fa125e
commit b824ba8
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 17 deletions.
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java
@@ -211,7 +211,7 @@ public void removeChainEstimatedHeightListener(final long listenerId) {
 
   public void recordRequestTimeout(final int requestCode) {
     LOG.atDebug()
-        .setMessage("Timed out while waiting for response from peer {}...")
+        .setMessage("Timed out while waiting for response from peer {}")
         .addArgument(this::getLoggableId)
         .log();
     LOG.trace("Timed out while waiting for response from peer {}", this);
@@ -220,7 +220,7 @@ public void recordRequestTimeout(final int requestCode) {
 
   public void recordUselessResponse(final String requestType) {
     LOG.atTrace()
-        .setMessage("Received useless response for request type {} from peer {}...")
+        .setMessage("Received useless response for request type {} from peer {}")
         .addArgument(requestType)
         .addArgument(this::getLoggableId)
         .log();
@@ -262,7 +262,7 @@ public RequestManager.ResponseStream send(
     if (connectionToUse.getAgreedCapabilities().stream()
         .noneMatch(capability -> capability.getName().equalsIgnoreCase(protocolName))) {
       LOG.atDebug()
-          .setMessage("Protocol {} unavailable for this peer {}...")
+          .setMessage("Protocol {} unavailable for this peer {}")
           .addArgument(protocolName)
           .addArgument(this.getLoggableId())
           .log();
@@ -272,7 +272,7 @@ public RequestManager.ResponseStream send(
         .anyMatch(
             p -> !p.isMessagePermitted(connectionToUse.getRemoteEnode(), messageData.getCode()))) {
       LOG.info(
-          "Permissioning blocked sending of message code {} to {}...",
+          "Permissioning blocked sending of message code {} to {}",
           messageData.getCode(),
           this.getLoggableId());
       if (LOG.isDebugEnabled()) {
@@ -437,7 +437,7 @@ Optional<RequestManager> dispatch(final EthMessage ethMessage, final String prot
         localRequestManager -> localRequestManager.dispatchResponse(ethMessage),
         () -> {
           LOG.trace(
-              "Message {} not expected has just been received for protocol {}, peer {} ",
+              "Message {} not expected has just been received for protocol {}, {} ",
               messageCode,
               protocolName,
               this);

diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java
@@ -480,7 +480,7 @@ private void handleStatusMessage(final EthPeer peer, final Message message) {
       }
     } catch (final RLPException e) {
       LOG.atDebug()
-          .setMessage("Unable to parse status message from peer {}... {}")
+          .setMessage("Unable to parse status message from peer {} {}")
           .addArgument(peer::getLoggableId)
           .addArgument(e)
           .log();

diff --git a/...n/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java b/...n/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java
@@ -126,7 +126,7 @@ protected Optional<List<BlockHeader>> processResponse(
     }
 
     LOG.atTrace()
-        .setMessage("Received {} of {} headers requested from peer {}...")
+        .setMessage("Received {} of {} headers requested from peer {}")
         .addArgument(headersList::size)
         .addArgument(count)
         .addArgument(peer::getLoggableId)
@@ -137,7 +137,7 @@ protected Optional<List<BlockHeader>> processResponse(
   private void updatePeerChainState(final EthPeer peer, final BlockHeader blockHeader) {
     if (blockHeader.getNumber() > peer.chainState().getEstimatedHeight()) {
       LOG.atTrace()
-          .setMessage("Updating chain state for peer {}... to block header {}")
+          .setMessage("Updating chain state for peer {} to block header {}")
           .addArgument(peer::getLoggableId)
           .addArgument(blockHeader::toLogString)
           .log();

diff --git a/...erledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java b/...erledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java
@@ -89,7 +89,7 @@ public void requestTransactions() {
                 transactionTracker.markTransactionsAsSeen(peer, retrievedTransactions);
 
                 LOG.atTrace()
-                    .setMessage("Got {} transactions of {} hashes requested from peer {}...")
+                    .setMessage("Got {} transactions of {} hashes requested from peer {}")
                     .addArgument(retrievedTransactions::size)
                     .addArgument(task.getTransactionHashes()::size)
                     .addArgument(peer::getLoggableId)
@@ -120,7 +120,7 @@ private List<Hash> getTxHashesAnnounced() {
     metrics.incrementAlreadySeenTransactions(metricLabel, alreadySeenCount);
     LOG.atTrace()
         .setMessage(
-            "Transaction hashes to request from peer {}... fresh count {}, already seen count {}")
+            "Transaction hashes to request from peer {} fresh count {}, already seen count {}")
         .addArgument(peer::getLoggableId)
         .addArgument(toRetrieve::size)
         .addArgument(alreadySeenCount)

diff --git a/...ain/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java b/...ain/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java
@@ -120,7 +120,7 @@ protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
           LOG.atTrace()
-              .setMessage("Requesting {} headers (hash {}...) from peer {}...")
+              .setMessage("Requesting {} headers (hash {}...) from peer {}")
               .addArgument(count)
               .addArgument(referenceHash.slice(0, 6))
               .addArgument(peer::getLoggableId)

diff --git a/...src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java b/...src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java
@@ -67,7 +67,7 @@ protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
           LOG.atTrace()
-              .setMessage("Requesting {} node data entries from peer {}...")
+              .setMessage("Requesting {} node data entries from peer {}")
               .addArgument(hashes::size)
               .addArgument(peer::getLoggableId)
               .log();

diff --git a/...ava/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java b/...ava/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java
@@ -62,7 +62,7 @@ protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
           LOG.atTrace()
-              .setMessage("Requesting {} transaction pool entries from peer {}...")
+              .setMessage("Requesting {} transaction pool entries from peer {}")
               .addArgument(hashes::size)
               .addArgument(peer::getLoggableId)
               .log();

diff --git a/...src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java b/...src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java
@@ -84,7 +84,7 @@ protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
           LOG.atTrace()
-              .setMessage("Requesting {} receipts from peer {}...")
+              .setMessage("Requesting {} receipts from peer {}")
               .addArgument(blockHeaders::size)
               .addArgument(peer::getLoggableId)
               .log();

diff --git a/...th/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java b/...th/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java
@@ -210,8 +210,7 @@ Optional<RetryingGetHeaderFromPeerByNumberTask> createGetHeaderTask(
       }
     }
 
-    LOG.debug(
-        "Query peer {}... for block {}.", peer.nodeId().toString().substring(0, 8), blockNumber);
+    LOG.debug("Query peer {} for block {}.", peer.getLoggableId(), blockNumber);
     return Optional.of(task);
   }
 

diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java
@@ -425,7 +425,6 @@ public void subscribeConnect(final ConnectCallback callback) {
   public void subscribeConnectRequest(final ShouldConnectCallback callback) {
     rlpxAgent.subscribeConnectRequest(callback);
   }
-  ;
 
   @Override
   public void subscribeDisconnect(final DisconnectCallback callback) {