Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-2267] Update CLI options in mismatched genesis file message #1031

Merged
merged 2 commits into from
Mar 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ protected void setGenesis(final Block genesisBlock) {
if (!genesisHash.get().equals(genesisBlock.getHash())) {
throw new InvalidConfigurationException(
"Supplied genesis block does not match stored chain data.\n"
+ "Please specify a different data directory with --datadir or specify the original genesis file with --genesis.");
+ "Please specify a different data directory with --data-path or specify the original genesis file with --genesis-file.");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ public void suppliedGenesisBlockMismatchStoredChainDataException() {
.isThrownBy(() -> blockchain00.setGenesis(genesisBlock01))
.withMessageContaining(
"Supplied genesis block does not match stored chain data.\n"
+ "Please specify a different data directory with --datadir or specify the original genesis file with --genesis.");
+ "Please specify a different data directory with --data-path or specify the original genesis file with --genesis-file.");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,8 @@ public void dataDirDisabledUnderDocker() {

final Path path = Paths.get(".");

parseCommand("--datadir", path.toString());
assertThat(commandErrorOutput.toString()).startsWith("Unknown options: --datadir, .");
parseCommand("--data-path", path.toString());
assertThat(commandErrorOutput.toString()).startsWith("Unknown options: --data-path, .");
assertThat(commandOutput.toString()).isEmpty();
}

Expand Down