Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MINOR] Include Enode URL in error message if parsing exception #6288

Merged
merged 6 commits into from
Dec 13, 2023
Merged

[MINOR] Include Enode URL in error message if parsing exception #6288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94cc0dd
typo
macfarla Dec 13, 2023
607fa08
include the actual Enode URL in the error message if IP can't be reso…
macfarla Dec 13, 2023
7bdbb7b
typo
macfarla Dec 13, 2023
57aa4f9
Merge branch 'main' of github.com:hyperledger/besu into enode-url-par…
macfarla Dec 13, 2023
4914dca
made comparison test in tangentially related unit test less specific
macfarla Dec 13, 2023
06b7257
Merge branch 'main' into enode-url-parse-error-message
macfarla Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
3 changes: 1 addition & 2 deletions ...src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
4 changes: 3 additions & 1 deletion ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
};
}

Expand Down
Loading