[MINOR] Include Enode URL in error message if parsing exception (hype…

…rledger#6288) * include the actual Enode URL in the error message if IP can't be resolved --------- Signed-off-by: Sally MacFarlane <[email protected]> Signed-off-by: jflo <[email protected]>
jflo · Dec 18, 2023 · 6d371a2 · 6d371a2
1 parent e7ad48e
commit 6d371a2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -3246,7 +3246,7 @@ private List<EnodeURL> buildEnodes(
   }
 
   /**
-   * Besu CLI Paramaters exception handler used by VertX. Visible for testing.
+   * Besu CLI Parameters exception handler used by VertX. Visible for testing.
    *
    * @return instance of BesuParameterExceptionHandler
    */

diff --git a/...src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java b/...src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java
@@ -232,7 +232,6 @@ public void nodeAllowlistCheckShouldNotWorkWithUnknownHostnameWhenOnlyDnsEnabled
                     true,
                     toml.toAbsolutePath().toString()))
         .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining(
-            "Invalid IP address (or DNS query resolved an invalid IP). --Xdns-enabled is true but --Xdns-update-enabled flag is false.");
+        .hasMessageContaining("Invalid IP address");
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java
@@ -83,7 +83,9 @@ public static EnodeURL fromString(
       String message = "";
       if (enodeDnsConfiguration.dnsEnabled() && !enodeDnsConfiguration.updateEnabled()) {
         message =
-            "Invalid IP address (or DNS query resolved an invalid IP). --Xdns-enabled is true but --Xdns-update-enabled flag is false.";
+            String.format(
+                "Invalid IP address '%s' (or DNS query resolved an invalid IP). --Xdns-enabled is true but --Xdns-update-enabled flag is false.",
+                value);
       } else {
         message =
             String.format(

diff --git a/...s/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java b/...s/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java
@@ -191,7 +191,7 @@ public static class NonDeterministicOperationException extends RuntimeException
   public Comparator<BlockHeader> getBlockChoiceRule() {
     return (a, b) -> {
       throw new NonDeterministicOperationException(
-          "ReferenceTestBlockchian for VMTest Chains do not support fork choice rules");
+          "ReferenceTestBlockchain for VMTest Chains do not support fork choice rules");
     };
   }