Merge PR #3498: various improvements to gaiad gentx/init

cmd/gaia/cli_test/test_helpers.go

@@ -153,7 +153,7 @@ func (f *Fixtures) UnsafeResetAll(flags ...string) {
 // GDInit is gaiad init
 // NOTE: GDInit sets the ChainID for the Fixtures instance
 func (f *Fixtures) GDInit(moniker string, flags ...string) {
-	cmd := fmt.Sprintf("gaiad init -o --moniker=%s --home=%s", moniker, f.GDHome)
+	cmd := fmt.Sprintf("gaiad init -o --home=%s %s", f.GDHome, moniker)
 	_, stderr := tests.ExecuteT(f.T, addFlags(cmd, flags), app.DefaultKeyPass)
 
 	var chainID string

cmd/gaia/init/gentx.go

@@ -62,10 +62,15 @@ following delegation and commission default parameters:
 				return err
 			}
 
-			ip, err := server.ExternalIP()
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "couldn't retrieve an external IP, "+
-					"consequently the tx's memo field will be unset: %s", err)
+			// Read --nodeID, if empty take it from priv_validator.json
+			if nodeIDString := viper.GetString(cli.FlagNodeID); nodeIDString != "" {
+				nodeID = nodeIDString
+			}
+
+			ip := viper.GetString(cli.FlagIP)
+			if ip == "" {
+				fmt.Fprintf(os.Stderr, "couldn't retrieve an external IP; "+
+					"the tx's memo field will be unset")
 			}
 
 			genDoc, err := LoadGenesisDoc(cdc, config.GenesisFile())
@@ -156,11 +161,15 @@ following delegation and commission default parameters:
 		},
 	}
 
+	ip, _ := server.ExternalIP()
+
 	cmd.Flags().String(tmcli.HomeFlag, app.DefaultNodeHome, "node's home directory")
 	cmd.Flags().String(flagClientHome, app.DefaultCLIHome, "client's home directory")
 	cmd.Flags().String(client.FlagName, "", "name of private key with which to sign the gentx")
 	cmd.Flags().String(client.FlagOutputDocument, "",
 		"write the genesis transaction JSON document to the given file instead of the default location")
+	cmd.Flags().String(cli.FlagIP, ip, "The node's public IP")
+	cmd.Flags().String(cli.FlagNodeID, "", "The node's NodeID")
 	cmd.Flags().AddFlagSet(cli.FsCommissionCreate)
 	cmd.Flags().AddFlagSet(cli.FsAmount)
 	cmd.Flags().AddFlagSet(cli.FsPk)

cmd/gaia/init/init.go

@@ -21,7 +21,6 @@ import (
 const (
 	flagOverwrite  = "overwrite"
 	flagClientHome = "home-client"
-	flagMoniker    = "moniker"
 )
 
 type printInfo struct {
@@ -46,11 +45,11 @@ func displayInfo(cdc *codec.Codec, info printInfo) error {
 // nolint
 func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "init",
+		Use:   "init [moniker]",
 		Short: "Initialize private validator, p2p, genesis, and application configuration files",
 		Long:  `Initialize validators's and node's configuration files.`,
-		Args:  cobra.NoArgs,
-		RunE: func(_ *cobra.Command, _ []string) error {
+		Args:  cobra.ExactArgs(1),
+		RunE: func(_ *cobra.Command, args []string) error {
 			config := ctx.Config
 			config.SetRoot(viper.GetString(cli.HomeFlag))
 
@@ -64,7 +63,7 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 				return err
 			}
 
-			config.Moniker = viper.GetString(flagMoniker)
+			config.Moniker = args[0]
 
 			var appState json.RawMessage
 			genFile := config.GenesisFile()
@@ -89,8 +88,6 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 	cmd.Flags().String(cli.HomeFlag, app.DefaultNodeHome, "node's home directory")
 	cmd.Flags().BoolP(flagOverwrite, "o", false, "overwrite the genesis.json file")
 	cmd.Flags().String(client.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created")
-	cmd.Flags().String(flagMoniker, "", "set the validator's moniker")
-	cmd.MarkFlagRequired(flagMoniker)
 
 	return cmd
 }

cmd/gaia/init/init_test.go

@@ -36,10 +36,7 @@ func TestInitCmd(t *testing.T) {
 	cdc := app.MakeCodec()
 	cmd := InitCmd(ctx, cdc)
 
-	viper.Set(flagMoniker, "gaianode-test")
-
-	err = cmd.RunE(nil, nil)
-	require.NoError(t, err)
+	require.NoError(t, cmd.RunE(nil, []string{"gaianode-test"}))
 }
 
 func setupClientHome(t *testing.T) func() {
@@ -64,11 +61,9 @@ func TestEmptyState(t *testing.T) {
 
 	ctx := server.NewContext(cfg, logger)
 	cdc := app.MakeCodec()
-	viper.Set(flagMoniker, "gaianode-test")
 
 	cmd := InitCmd(ctx, cdc)
-	err = cmd.RunE(nil, nil)
-	require.NoError(t, err)
+	require.NoError(t, cmd.RunE(nil, []string{"gaianode-test"}))
 
 	old := os.Stdout
 	r, w, _ := os.Pipe()
@@ -103,7 +98,6 @@ func TestStartStandAlone(t *testing.T) {
 		os.RemoveAll(home)
 	}()
 	viper.Set(cli.HomeFlag, home)
-	viper.Set(client.FlagName, "moniker")
 	defer setupClientHome(t)()
 
 	logger := log.NewNopLogger()
@@ -112,8 +106,7 @@ func TestStartStandAlone(t *testing.T) {
 	ctx := server.NewContext(cfg, logger)
 	cdc := app.MakeCodec()
 	initCmd := InitCmd(ctx, cdc)
-	err = initCmd.RunE(nil, nil)
-	require.NoError(t, err)
+	require.NoError(t, initCmd.RunE(nil, []string{"gaianode-test"}))
 
 	app, err := mock.NewApp(home, logger)
 	require.Nil(t, err)