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

warning invalid sync mode option [#3884] #4017

Merged
merged 5 commits into from
Jun 27, 2022
Merged

warning invalid sync mode option [#3884] #4017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1ce5f2
Remove custom converter for SyncMode
gfukushima Jun 22, 2022
4e57ce0
Remove fromString method not being used
gfukushima Jun 22, 2022
1ee2d09
Added test to check invalid sync-mode
gfukushima Jun 22, 2022
7bc0de3
Merge branch 'hyperledger:main' into #3884_warning_invalid_sync-mode_…
gfukushima Jun 22, 2022
d3385e8
Merge branch 'hyperledger:main' into #3884_warning_invalid_sync-mode_…
gfukushima Jun 27, 2022
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
1 change: 0 additions & 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 @@ -1474,7 +1474,6 @@ private void registerConverters() {
commandLine.registerConverter(Address.class, Address::fromHexStringStrict);
commandLine.registerConverter(Bytes.class, Bytes::fromHexString);
commandLine.registerConverter(Level.class, Level::valueOf);
commandLine.registerConverter(SyncMode.class, SyncMode::fromString);
commandLine.registerConverter(MetricsProtocol.class, MetricsProtocol::fromString);
commandLine.registerConverter(UInt256.class, (arg) -> UInt256.valueOf(new BigInteger(arg)));
commandLine.registerConverter(Wei.class, (arg) -> Wei.of(Long.parseUnsignedLong(arg)));
Expand Down
11 changes: 11 additions & 0 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 @@ -1620,6 +1620,17 @@ public void syncMode_full() {
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
}

@Test
public void syncMode_invalid() {
parseCommand("--sync-mode", "bogus");
Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandOutput.toString(UTF_8)).isEmpty();
assertThat(commandErrorOutput.toString(UTF_8))
.contains(
"Invalid value for option '--sync-mode': expected one of [FULL, FAST, X_SNAP, X_CHECKPOINT] (case-insensitive) but was 'bogus'");
}

@Test
public void syncMode_full_by_default_for_dev() {
parseCommand("--network", "dev");
Expand Down
9 changes: 0 additions & 9 deletions ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@ public enum SyncMode {
// Perform snapsync but starting from a checkpoint instead of starting from genesis
X_CHECKPOINT;

public static SyncMode fromString(final String str) {
for (final SyncMode mode : SyncMode.values()) {
if (mode.name().equalsIgnoreCase(str)) {
return mode;
}
}
return null;
}

public static boolean isFullSync(final SyncMode syncMode) {
return !EnumSet.of(SyncMode.FAST, SyncMode.X_SNAP, SyncMode.X_CHECKPOINT).contains(syncMode);
}
Expand Down