Skip to content

CLI options tests - check error first; fix typo rpl #8666

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

Merged
macfarla merged 2 commits into from
May 22, 2025
Merged

CLI options tests - check error first; fix typo rpl #8666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dc31cf
check error first; fix typo rpl
macfarla May 22, 2025
57e3f08
Merge branch 'main' into rpl
macfarla May 22, 2025
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
8 changes: 4 additions & 4 deletions besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,15 @@ public void testGenesisOverrideOptionsWithCustomGenesis() throws Exception {
public void callingHelpSubCommandMustDisplayUsage() {
parseCommand("--help");
final String expectedOutputStart = String.format("Usage:%n%nbesu [OPTIONS] [COMMAND]");
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
}

@Test
public void callingHelpDisplaysDefaultRpcApisCorrectly() {
parseCommand("--help");
assertThat(commandOutput.toString(UTF_8)).contains("default: [ETH, NET, WEB3]");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains("default: [ETH, NET, WEB3]");
}

@Test
Expand Down Expand Up @@ -1204,10 +1204,10 @@ public void helpShouldDisplayFastSyncOptions() {

verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains("--fast-sync-min-peers");
// whitelist is now a hidden option
assertThat(commandOutput.toString(UTF_8)).doesNotContain("whitelist");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
}

@Test
Expand Down Expand Up @@ -2052,10 +2052,10 @@ public void fullCLIOptionsShown() {

verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains("--config-file");
assertThat(commandOutput.toString(UTF_8)).contains("--data-path");
assertThat(commandOutput.toString(UTF_8)).contains("--genesis-file");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion besu/src/test/java/org/hyperledger/besu/cli/NatOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public void helpShouldDisplayNatMethodInfo() {

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandOutput.toString(UTF_8)).contains("--nat-method");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains("--nat-method");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public void passwordSubCommandVersionDisplaysVersion() {
@Test
public void passwordHashSubCommandVersionDisplaysVersion() {
parseCommand("password", "hash", "--version");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8))
.isEqualToIgnoringWhitespace(BesuVersionUtils.version());
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ public void publicKeySubCommandExistsAndHasSubCommands() {
@Test
public void callingPublicKeySubCommandWithoutSubSubcommandMustDisplayUsage() {
parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME);
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
}

@Test
public void callingPublicKeySubCommandHelpMustDisplayUsage() {
parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
}

@Test
Expand All @@ -175,8 +175,8 @@ public void callingPublicKeySubCommandVersionMustDisplayVersion() {
@Test
public void callingPublicKeyExportSubCommandHelpMustDisplayUsage() {
parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_USAGE);
}

@Test
Expand All @@ -194,8 +194,8 @@ public void callingPublicKeyExportSubCommandWithoutPathMustWriteKeyToStandardOut
parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME);

final String expectedOutputStart = nodeKey.getPublicKey().toString();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
}

@Test
Expand Down Expand Up @@ -237,8 +237,8 @@ public void callingPublicKeyExportSubCommandWithPrivateKeyFileMustWriteKeyToStan
privateKeyFile.toString());

final String expectedOutputStart = keyPair.getPublicKey().toString();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
}

@Test
Expand Down Expand Up @@ -271,8 +271,8 @@ public void callingPublicKeyExportSubCommandWithInvalidFileMustDisplayError() th
@Test
public void callingPublicKeyExportAddressSubCommandHelpMustDisplayUsage() {
parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_ADDRESS_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_ADDRESS_USAGE);
}

@Test
Expand All @@ -291,8 +291,8 @@ public void callingPublicKeyExportAddressSubCommandWithoutPathMustWriteAddressTo
parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME);

final String expectedOutputStart = Util.publicKeyToAddress(nodeKey.getPublicKey()).toString();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
}

@Test
Expand Down Expand Up @@ -338,8 +338,8 @@ public void callingPublicKeyExportAddressSubCommandWithFilePathMustWriteAddressI
privateKeyFile.toString());

final String expectedOutputStart = Util.publicKeyToAddress(keyPair.getPublicKey()).toString();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions besu/src/test/java/org/hyperledger/besu/cli/ValidateConfigSubCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public void validateConfigSubCommandExists() {
@Test
public void callingValidateConfigSubCommandHelpMustDisplayUsage() {
parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
}

@Test
Expand All @@ -84,9 +84,9 @@ public void callingValidateConfigSubCommandWithInvalidFileMustDisplayError() thr
Files.writeString(invalidToml, "xyz=");
invalidToml.toFile().deleteOnExit();

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--config-file", invalidToml.toString());
assertThat(commandOutput.toString(UTF_8)).contains("Invalid TOML configuration");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
}

@Test
Expand All @@ -98,7 +98,7 @@ public void callingValidateConfigSubCommandWithValidTomlFileSucceeds() throws IO
validToml.toFile().deleteOnExit();

parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--config-file", validToml.toString());
assertThat(commandOutput.toString(UTF_8)).startsWith("TOML config file is valid");
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith("TOML config file is valid");
}
}
6 changes: 3 additions & 3 deletions besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ public void blockSubCommandExistsAndHasSubCommands() {
@Test
public void callingBlockSubCommandWithoutSubSubcommandMustDisplayUsage() {
parseCommand(BLOCK_SUBCOMMAND_NAME);
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_USAGE);
}

@Test
public void callingBlockSubCommandHelpMustDisplayUsage() {
parseCommand(BLOCK_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_USAGE);
}

@Test
Expand Down Expand Up @@ -472,8 +472,8 @@ public void blocksExport_withInvalidEnd() throws IOException {
@Test
public void callingBlockExportSubCommandHelpMustDisplayUsage() {
parseCommand(BLOCK_SUBCOMMAND_NAME, BLOCK_EXPORT_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_EXPORT_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_EXPORT_USAGE);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions besu/src/test/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ public void operatorSubCommandExistAndHaveSubCommands() {
@Test
public void callingOperatorSubCommandWithoutSubSubcommandMustDisplayUsage() {
parseCommand(OperatorSubCommand.COMMAND_NAME);
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_OPERATOR_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_OPERATOR_USAGE);
}

@Test
public void callingOperatorCommandHelpMustDisplayUsage() {
parseCommand(OperatorSubCommand.COMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_OPERATOR_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_OPERATOR_USAGE);
}

@Test
Expand Down
26 changes: 13 additions & 13 deletions besu/src/test/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,35 +85,35 @@ public void rlpSubCommandExistsAndHasSubCommands() {
@Test
public void callingRLPSubCommandWithoutSubSubcommandMustDisplayUsage() {
parseCommand(RLP_SUBCOMMAND_NAME);
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_USAGE);
}

@Test
public void callingRPLSubCommandHelpMustDisplayUsage() {
public void callingRLPSubCommandHelpMustDisplayUsage() {
parseCommand(RLP_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_USAGE);
}

// Encode RLP sub-command
@Test
public void callingRPLEncodeSubCommandHelpMustDisplayUsage() {
public void callingRLPEncodeSubCommandHelpMustDisplayUsage() {
parseCommand(RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME, "--help");
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_ENCODE_USAGE);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_ENCODE_USAGE);
}

@Test
public void callingRPLSubCommandVersionMustDisplayVersion() {
public void callingRLPSubCommandVersionMustDisplayVersion() {
parseCommand(RLP_SUBCOMMAND_NAME, "--version");
assertThat(commandOutput.toString(UTF_8))
.isEqualToIgnoringWhitespace(BesuVersionUtils.version());
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
}

@Test
public void callingRPLEncodeSubCommandVersionMustDisplayVersion() {
public void callingRLPEncodeSubCommandVersionMustDisplayVersion() {
parseCommand(RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME, "--version");
assertThat(commandOutput.toString(UTF_8))
.isEqualToIgnoringWhitespace(BesuVersionUtils.version());
Expand All @@ -134,8 +134,8 @@ public void encodeWithoutPathMustWriteToStandardOutput() {
final String expectedRlpString =
"0xf853a00000000000000000000000000000000000000000000000000000000000000000ea94be068f726a13c8d"
+ "46c44be6ce9d275600e1735a4945ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193808400000000c0";
assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
}

@Test
Expand Down Expand Up @@ -181,8 +181,8 @@ public void encodeWithInputFilePathMustReadFromThisFile(final @TempDir Path dir)
final String expectedRlpString =
"0xf853a00000000000000000000000000000000000000000000000000000000000000000ea94be068f726a13c8d"
+ "46c44be6ce9d275600e1735a4945ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193808400000000c0";
assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
}
}

Expand All @@ -207,8 +207,8 @@ public void canEncodeToQbftExtraData(final @TempDir Path dir) throws Exception {
final String expectedRlpString =
"0xf84fa00000000000000000000000000000000000000000000000000000000000000000ea94be068f726a13c8d"
+ "46c44be6ce9d275600e1735a4945ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193c080c0";
assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
}
}

Expand Down Expand Up @@ -276,8 +276,8 @@ public void decodeWithoutPathMustWriteToStandardOutput() {

final String expectedValidatorString =
"[0xbe068f726a13c8d46c44be6ce9d275600e1735a4, 0x5ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193]";
assertThat(commandOutput.toString(UTF_8)).contains(expectedValidatorString);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains(expectedValidatorString);
}

@Test
Expand All @@ -294,8 +294,8 @@ public void decodeQBFTWithoutPathMustWriteToStandardOutput() {

final String expectedValidatorString =
"[0x241f804efb46f71acaa5be94a62f7798e89c3724, 0x6cdf72da457453063ea92e7fa5ac30afbcec28cd]";
assertThat(commandOutput.toString(UTF_8)).contains(expectedValidatorString);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains(expectedValidatorString);
}

@Test
Expand Down Expand Up @@ -341,8 +341,8 @@ public void decodeWithInputFilePathMustReadFromThisFile(final @TempDir Path dir)
final String expectedValidatorString =
"[0xbe068f726a13c8d46c44be6ce9d275600e1735a4, 0x5ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193]";

assertThat(commandOutput.toString(UTF_8)).contains(expectedValidatorString);
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).contains(expectedValidatorString);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ public Optional<Address> contractAddress() {
* Creates a copy of this transaction that does not share any underlying byte array.
*
* <p>This is useful in case the transaction is built from a block body and fields, like to or
* payload, are wrapping (and so keeping references) sections of the large RPL encoded block body,
* payload, are wrapping (and so keeping references) sections of the large RLP encoded block body,
* and we plan to keep the transaction around for some time, like in the txpool in case of a
* reorg, and do not want to keep all the block body in memory for a long time, but only the
* actual transaction.
Expand Down
Loading