diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java index 81725b52ba..43b4f9d235 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java @@ -31,6 +31,7 @@ public interface DefaultCommandValues { String MANDATORY_PATH_FORMAT_HELP = ""; String MANDATORY_FILE_FORMAT_HELP = ""; + String MANDATORY_DIRECTORY_FORMAT_HELP = ""; String PANTHEON_HOME_PROPERTY_NAME = "pantheon.home"; String DEFAULT_DATA_DIR_PATH = "./build/data"; String MANDATORY_INTEGER_FORMAT_HELP = ""; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommand.java index 5c2293e21d..be0dc4e9f5 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommand.java @@ -14,6 +14,7 @@ package tech.pegasys.pantheon.cli.operator; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; +import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_DIRECTORY_FORMAT_HELP; import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP; import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP; import static tech.pegasys.pantheon.cli.operator.OperatorSubCommand.COMMAND_NAME; @@ -83,7 +84,8 @@ public class OperatorSubCommand implements Runnable { @Command( name = "generate-blockchain-config", - description = "This command generates blockchain network configuration files.", + description = + "This command generates node keypairs, genesis file (with RLP encoded IBFT 2.0 extra data).", mixinStandardHelpOptions = true) static class GenerateNetworkConfigSubCommand implements Runnable { @Option( @@ -97,7 +99,7 @@ public class OperatorSubCommand implements Runnable { @Option( required = true, names = "--to", - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = MANDATORY_DIRECTORY_FORMAT_HELP, description = "Directory to write output files to.", arity = "1..1") private File outputDirectory = null; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java index 09d9a9f977..fa7601c46a 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java @@ -62,9 +62,9 @@ public class OperatorSubCommandTest extends CommandTestAbstract { + System.lineSeparator() + "Commands:" + System.lineSeparator() - + " generate-blockchain-config This command generates blockchain network" + + " generate-blockchain-config This command generates node keypairs, genesis" + System.lineSeparator() - + " configuration files."; + + " file (with RLP encoded IBFT 2.0 extra data)."; private Path tmpOutputDirectoryPath;