From dedba2a9865eb09a3c1da4ddb114c8c7689b6cc4 Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Thu, 14 Mar 2019 20:16:14 +0100 Subject: [PATCH 01/11] add website, details and identity to gentx - start testing it Signed-off-by: Karoly Albert Szabo --- cmd/gaia/init/gentx.go | 20 +++++++++++++++++-- cmd/gaia/init/gentx_test.go | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 cmd/gaia/init/gentx_test.go diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index 6ce4badecee5..2ff298758e07 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -47,6 +47,7 @@ func GenTxCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "gentx", Short: "Generate a genesis tx carrying a self delegation", + Args: cobra.NoArgs, Long: fmt.Sprintf(`This command is an alias of the 'gaiad tx create-validator' command'. It creates a genesis piece carrying a self delegation with the @@ -107,8 +108,17 @@ following delegation and commission default parameters: } } + // Read --website (optional) + website := viper.GetString(cli.FlagWebsite) + + // Read --details (optional) + details := viper.GetString(cli.FlagDetails) + + // Read --identity (optional) + identity := viper.GetString(cli.FlagIdentity) + // Set flags for creating gentx - prepareFlagsForTxCreateValidator(config, nodeID, ip, genDoc.ChainID, valPubKey) + prepareFlagsForTxCreateValidator(config, nodeID, ip, genDoc.ChainID, valPubKey, website, details, identity) // Fetch the amount of coins staked amount := viper.GetString(cli.FlagAmount) @@ -188,6 +198,9 @@ following delegation and commission default parameters: "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().String(cli.FlagWebsite, "", "The validator's (optional) website") + cmd.Flags().String(cli.FlagDetails, "", "The validator's (optional) details") + cmd.Flags().String(cli.FlagIdentity, "", "The (optional) identity signature (ex. UPort or Keybase)") cmd.Flags().AddFlagSet(cli.FsCommissionCreate) cmd.Flags().AddFlagSet(cli.FsMinSelfDelegation) cmd.Flags().AddFlagSet(cli.FsAmount) @@ -225,7 +238,7 @@ func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins s } func prepareFlagsForTxCreateValidator(config *cfg.Config, nodeID, ip, chainID string, - valPubKey crypto.PubKey) { + valPubKey crypto.PubKey, website string, details string, identity string) { viper.Set(tmcli.HomeFlag, viper.GetString(flagClientHome)) // --home viper.Set(client.FlagChainID, chainID) viper.Set(client.FlagFrom, viper.GetString(client.FlagName)) // --from @@ -234,6 +247,9 @@ func prepareFlagsForTxCreateValidator(config *cfg.Config, nodeID, ip, chainID st viper.Set(cli.FlagPubKey, sdk.MustBech32ifyConsPub(valPubKey)) // --pubkey viper.Set(client.FlagGenerateOnly, true) // --genesis-format viper.Set(cli.FlagMoniker, config.Moniker) // --moniker + viper.Set(cli.FlagWebsite, website) // --website + viper.Set(cli.FlagDetails, details) // --details + viper.Set(cli.FlagIdentity, identity) // --identity if config.Moniker == "" { viper.Set(cli.FlagMoniker, viper.GetString(client.FlagName)) } diff --git a/cmd/gaia/init/gentx_test.go b/cmd/gaia/init/gentx_test.go new file mode 100644 index 000000000000..dd29f71eebe4 --- /dev/null +++ b/cmd/gaia/init/gentx_test.go @@ -0,0 +1,39 @@ +package init + +import ( + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/cmd/gaia/app" + "github.com/cosmos/cosmos-sdk/server" + "github.com/cosmos/cosmos-sdk/x/staking/client/cli" + "github.com/spf13/viper" + "github.com/stretchr/testify/require" + tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" + "github.com/tendermint/tendermint/libs/log" + "testing" +) + +func TestGenTxCmd(t *testing.T) { + defer server.SetupViper(t)() + defer setupClientHome(t)() + + logger := log.NewNopLogger() + cfg, err := tcmd.ParseConfig() + require.Nil(t, err) + + ctx := server.NewContext(cfg, logger) + cdc := app.MakeCodec() + + cmd := InitCmd(ctx, cdc) + require.NoError(t, cmd.RunE(nil, []string{"gaianode-test"})) + + nodeID, valPubKey, err := InitializeNodeValidatorFiles(cfg) + //cmd2 := GenTxCmd(ctx, cdc) + + viper.Set(cli.FlagIP, "1.2.3.4") + viper.Set(cli.FlagMoniker, "gaianode-test") + viper.Set(client.FlagName, "gaianode-test") + viper.Set(cli.FlagNodeID, nodeID) + viper.Set(cli.FlagPubKey, valPubKey) + viper.Set(cli.FlagWebsite, "not.work.ing") + //require.NoError(t, cmd2.RunE(nil, nil)) +} From 92136162393c091d9a8c0b136fc1f90803c9ea3c Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Fri, 15 Mar 2019 15:37:19 +0100 Subject: [PATCH 02/11] add single test for setting up viper new parameters Signed-off-by: Karoly Albert Szabo --- cmd/gaia/init/gentx_test.go | 40 +++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/cmd/gaia/init/gentx_test.go b/cmd/gaia/init/gentx_test.go index dd29f71eebe4..668057c6902e 100644 --- a/cmd/gaia/init/gentx_test.go +++ b/cmd/gaia/init/gentx_test.go @@ -1,39 +1,35 @@ package init import ( - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/cmd/gaia/app" - "github.com/cosmos/cosmos-sdk/server" - "github.com/cosmos/cosmos-sdk/x/staking/client/cli" + "testing" + "github.com/spf13/viper" "github.com/stretchr/testify/require" tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" "github.com/tendermint/tendermint/libs/log" - "testing" + + "github.com/cosmos/cosmos-sdk/server" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/staking/client/cli" ) func TestGenTxCmd(t *testing.T) { defer server.SetupViper(t)() defer setupClientHome(t)() - - logger := log.NewNopLogger() cfg, err := tcmd.ParseConfig() require.Nil(t, err) - + logger := log.NewNopLogger() ctx := server.NewContext(cfg, logger) - cdc := app.MakeCodec() - - cmd := InitCmd(ctx, cdc) - require.NoError(t, cmd.RunE(nil, []string{"gaianode-test"})) - - nodeID, valPubKey, err := InitializeNodeValidatorFiles(cfg) - //cmd2 := GenTxCmd(ctx, cdc) - viper.Set(cli.FlagIP, "1.2.3.4") - viper.Set(cli.FlagMoniker, "gaianode-test") - viper.Set(client.FlagName, "gaianode-test") - viper.Set(cli.FlagNodeID, nodeID) - viper.Set(cli.FlagPubKey, valPubKey) - viper.Set(cli.FlagWebsite, "not.work.ing") - //require.NoError(t, cmd2.RunE(nil, nil)) + nodeID := "X" + chainID := "X" + ip := "X" + valPubKey, _ := sdk.GetConsPubKeyBech32("cosmosvalconspub1zcjduepq7jsrkl9fgqk0wj3ahmfr8pgxj6vakj2wzn656s8pehh0zhv2w5as5gd80a") + website := "http://cosmos.network" + details := "validator details" + identity := "that's me" + prepareFlagsForTxCreateValidator(ctx.Config, nodeID, ip, chainID, valPubKey, website, details, identity) + require.Equal(t, website, viper.GetString(cli.FlagWebsite)) + require.Equal(t, details, viper.GetString(cli.FlagDetails)) + require.Equal(t, identity, viper.GetString(cli.FlagIdentity)) } From 57c8f428c9402d35e6777e9368481826c85aee32 Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Mon, 18 Mar 2019 14:12:17 +0100 Subject: [PATCH 03/11] minimal testing with and without defaults in place Signed-off-by: Karoly Albert Szabo --- cmd/gaia/init/gentx_test.go | 82 +++++++++++++++++++++++++++++-------- 1 file changed, 65 insertions(+), 17 deletions(-) diff --git a/cmd/gaia/init/gentx_test.go b/cmd/gaia/init/gentx_test.go index 668057c6902e..f379f990aa3b 100644 --- a/cmd/gaia/init/gentx_test.go +++ b/cmd/gaia/init/gentx_test.go @@ -3,33 +3,81 @@ package init import ( "testing" + "github.com/cosmos/cosmos-sdk/server" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/staking/client/cli" "github.com/spf13/viper" "github.com/stretchr/testify/require" tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" + cfg "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/log" - - "github.com/cosmos/cosmos-sdk/server" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/staking/client/cli" ) -func TestGenTxCmd(t *testing.T) { +func Test_prepareFlagsForTxCreateValidator(t *testing.T) { defer server.SetupViper(t)() defer setupClientHome(t)() - cfg, err := tcmd.ParseConfig() + config, err := tcmd.ParseConfig() require.Nil(t, err) logger := log.NewNopLogger() - ctx := server.NewContext(cfg, logger) + ctx := server.NewContext(config, logger) - nodeID := "X" - chainID := "X" - ip := "X" valPubKey, _ := sdk.GetConsPubKeyBech32("cosmosvalconspub1zcjduepq7jsrkl9fgqk0wj3ahmfr8pgxj6vakj2wzn656s8pehh0zhv2w5as5gd80a") - website := "http://cosmos.network" - details := "validator details" - identity := "that's me" - prepareFlagsForTxCreateValidator(ctx.Config, nodeID, ip, chainID, valPubKey, website, details, identity) - require.Equal(t, website, viper.GetString(cli.FlagWebsite)) - require.Equal(t, details, viper.GetString(cli.FlagDetails)) - require.Equal(t, identity, viper.GetString(cli.FlagIdentity)) + + type args struct { + config *cfg.Config + nodeID string + ip string + chainID string + valPubKey crypto.PubKey + website string + details string + identity string + } + tests := []struct { + name string + args args + }{ + {"No parameters", args{ctx.Config, "X", "0.0.0.0", "chainId", valPubKey, "", "", ""}}, + {"Oprtional parameters fed", args{ctx.Config, "X", "0.0.0.0", "chainId", valPubKey, "cosmos.network", "details", "identity"}}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + prepareFlagsForTxCreateValidator(tt.args.config, tt.args.nodeID, tt.args.ip, tt.args.chainID, tt.args.valPubKey, tt.args.website, tt.args.details, tt.args.identity) + require.Equal(t, tt.args.website, viper.GetString(cli.FlagWebsite)) + require.Equal(t, tt.args.details, viper.GetString(cli.FlagDetails)) + require.Equal(t, tt.args.identity, viper.GetString(cli.FlagIdentity)) + require.Equal(t, defaultAmount, viper.GetString(cli.FlagAmount)) + require.Equal(t, defaultCommissionRate, viper.GetString(cli.FlagCommissionRate)) + require.Equal(t, defaultCommissionMaxRate, viper.GetString(cli.FlagCommissionMaxRate)) + require.Equal(t, defaultCommissionMaxChangeRate, viper.GetString(cli.FlagCommissionMaxChangeRate)) + require.Equal(t, defaultMinSelfDelegation, viper.GetString(cli.FlagMinSelfDelegation)) + }) + } + + var amount = "5stake" + var commissionRate = "1.0" + var commissionMaxRate = "1.0" + var commissionMaxChangeRate = "1.0" + var minSelfDelegation = "1.0" + + viper.Set(cli.FlagAmount, amount) + viper.Set(cli.FlagCommissionRate, commissionRate) + viper.Set(cli.FlagCommissionMaxRate, commissionMaxRate) + viper.Set(cli.FlagCommissionMaxChangeRate, commissionMaxChangeRate) + viper.Set(cli.FlagMinSelfDelegation, minSelfDelegation) + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + prepareFlagsForTxCreateValidator(tt.args.config, tt.args.nodeID, tt.args.ip, tt.args.chainID, tt.args.valPubKey, tt.args.website, tt.args.details, tt.args.identity) + require.Equal(t, tt.args.website, viper.GetString(cli.FlagWebsite)) + require.Equal(t, tt.args.details, viper.GetString(cli.FlagDetails)) + require.Equal(t, tt.args.identity, viper.GetString(cli.FlagIdentity)) + require.Equal(t, amount, viper.GetString(cli.FlagAmount)) + require.Equal(t, commissionRate, viper.GetString(cli.FlagCommissionRate)) + require.Equal(t, commissionMaxRate, viper.GetString(cli.FlagCommissionMaxRate)) + require.Equal(t, commissionMaxChangeRate, viper.GetString(cli.FlagCommissionMaxChangeRate)) + require.Equal(t, minSelfDelegation, viper.GetString(cli.FlagMinSelfDelegation)) + }) + } } From e7b74b9d281897636107793f5e76d210e304392c Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Mon, 18 Mar 2019 14:39:14 +0100 Subject: [PATCH 04/11] refactor test Signed-off-by: Karoly Albert Szabo --- cmd/gaia/init/gentx_test.go | 72 +++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/cmd/gaia/init/gentx_test.go b/cmd/gaia/init/gentx_test.go index f379f990aa3b..d99a562fc03c 100644 --- a/cmd/gaia/init/gentx_test.go +++ b/cmd/gaia/init/gentx_test.go @@ -34,50 +34,52 @@ func Test_prepareFlagsForTxCreateValidator(t *testing.T) { details string identity string } - tests := []struct { + + type extraParams struct { + amount string + commissionRate string + commissionMaxRate string + commissionMaxChangeRate string + minSelfDelegation string + } + + type testcase struct { name string args args - }{ + } + + runTest := func(t *testing.T, tt testcase, params extraParams) { + prepareFlagsForTxCreateValidator(tt.args.config, tt.args.nodeID, tt.args.ip, tt.args.chainID, tt.args.valPubKey, tt.args.website, tt.args.details, tt.args.identity) + require.Equal(t, tt.args.website, viper.GetString(cli.FlagWebsite)) + require.Equal(t, tt.args.details, viper.GetString(cli.FlagDetails)) + require.Equal(t, tt.args.identity, viper.GetString(cli.FlagIdentity)) + require.Equal(t, params.amount, viper.GetString(cli.FlagAmount)) + require.Equal(t, params.commissionRate, viper.GetString(cli.FlagCommissionRate)) + require.Equal(t, params.commissionMaxRate, viper.GetString(cli.FlagCommissionMaxRate)) + require.Equal(t, params.commissionMaxChangeRate, viper.GetString(cli.FlagCommissionMaxChangeRate)) + require.Equal(t, params.minSelfDelegation, viper.GetString(cli.FlagMinSelfDelegation)) + } + + tests := []testcase{ {"No parameters", args{ctx.Config, "X", "0.0.0.0", "chainId", valPubKey, "", "", ""}}, - {"Oprtional parameters fed", args{ctx.Config, "X", "0.0.0.0", "chainId", valPubKey, "cosmos.network", "details", "identity"}}, + {"Optional parameters fed", args{ctx.Config, "X", "0.0.0.0", "chainId", valPubKey, "cosmos.network", "details", "identity"}}, } + + defaultParams := extraParams{defaultAmount, defaultCommissionRate, defaultCommissionMaxRate, defaultCommissionMaxChangeRate, defaultMinSelfDelegation} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - prepareFlagsForTxCreateValidator(tt.args.config, tt.args.nodeID, tt.args.ip, tt.args.chainID, tt.args.valPubKey, tt.args.website, tt.args.details, tt.args.identity) - require.Equal(t, tt.args.website, viper.GetString(cli.FlagWebsite)) - require.Equal(t, tt.args.details, viper.GetString(cli.FlagDetails)) - require.Equal(t, tt.args.identity, viper.GetString(cli.FlagIdentity)) - require.Equal(t, defaultAmount, viper.GetString(cli.FlagAmount)) - require.Equal(t, defaultCommissionRate, viper.GetString(cli.FlagCommissionRate)) - require.Equal(t, defaultCommissionMaxRate, viper.GetString(cli.FlagCommissionMaxRate)) - require.Equal(t, defaultCommissionMaxChangeRate, viper.GetString(cli.FlagCommissionMaxChangeRate)) - require.Equal(t, defaultMinSelfDelegation, viper.GetString(cli.FlagMinSelfDelegation)) + t.Run(tt.name, func(t *testing.T) { runTest(t, tt, defaultParams) }) }) } - var amount = "5stake" - var commissionRate = "1.0" - var commissionMaxRate = "1.0" - var commissionMaxChangeRate = "1.0" - var minSelfDelegation = "1.0" - - viper.Set(cli.FlagAmount, amount) - viper.Set(cli.FlagCommissionRate, commissionRate) - viper.Set(cli.FlagCommissionMaxRate, commissionMaxRate) - viper.Set(cli.FlagCommissionMaxChangeRate, commissionMaxChangeRate) - viper.Set(cli.FlagMinSelfDelegation, minSelfDelegation) - + // Override default params + params := extraParams{"5stake", "1.0", "1.0", "1.0", "1.0"} + viper.Set(cli.FlagAmount, params.amount) + viper.Set(cli.FlagCommissionRate, params.commissionRate) + viper.Set(cli.FlagCommissionMaxRate, params.commissionMaxRate) + viper.Set(cli.FlagCommissionMaxChangeRate, params.commissionMaxChangeRate) + viper.Set(cli.FlagMinSelfDelegation, params.minSelfDelegation) for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - prepareFlagsForTxCreateValidator(tt.args.config, tt.args.nodeID, tt.args.ip, tt.args.chainID, tt.args.valPubKey, tt.args.website, tt.args.details, tt.args.identity) - require.Equal(t, tt.args.website, viper.GetString(cli.FlagWebsite)) - require.Equal(t, tt.args.details, viper.GetString(cli.FlagDetails)) - require.Equal(t, tt.args.identity, viper.GetString(cli.FlagIdentity)) - require.Equal(t, amount, viper.GetString(cli.FlagAmount)) - require.Equal(t, commissionRate, viper.GetString(cli.FlagCommissionRate)) - require.Equal(t, commissionMaxRate, viper.GetString(cli.FlagCommissionMaxRate)) - require.Equal(t, commissionMaxChangeRate, viper.GetString(cli.FlagCommissionMaxChangeRate)) - require.Equal(t, minSelfDelegation, viper.GetString(cli.FlagMinSelfDelegation)) - }) + t.Run(tt.name, func(t *testing.T) { runTest(t, tt, params) }) } } From ee786a3cc9960d412dcdf6eb251918b090f8c7af Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Mon, 18 Mar 2019 18:43:37 +0100 Subject: [PATCH 05/11] pending for new flags Signed-off-by: Karoly Albert Szabo --- .../3858-add-website-details-and-identity-to-gentx-cli-command | 1 + 1 file changed, 1 insertion(+) create mode 100644 .pending/features/sdk/3858-add-website-details-and-identity-to-gentx-cli-command diff --git a/.pending/features/sdk/3858-add-website-details-and-identity-to-gentx-cli-command b/.pending/features/sdk/3858-add-website-details-and-identity-to-gentx-cli-command new file mode 100644 index 000000000000..0d55fa7f3015 --- /dev/null +++ b/.pending/features/sdk/3858-add-website-details-and-identity-to-gentx-cli-command @@ -0,0 +1 @@ +#3858 add website, details and identity to gentx cli command \ No newline at end of file From c02a82becb9a80bd3b024babff459cc3afd3779e Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Mon, 18 Mar 2019 18:47:19 +0100 Subject: [PATCH 06/11] pending for validate genesis before gentx Signed-off-by: Karoly Albert Szabo --- .../bugfixes/gaiacli/3825-validate-genesis-before-running-gentx | 1 + 1 file changed, 1 insertion(+) create mode 100644 .pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx diff --git a/.pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx b/.pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx new file mode 100644 index 000000000000..3575f7aa394f --- /dev/null +++ b/.pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx @@ -0,0 +1 @@ +#3825 validate genesis before running gentx \ No newline at end of file From b873d097c9ea2f293e703d105eec77b4250fa8a1 Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Wed, 20 Mar 2019 13:20:29 +0100 Subject: [PATCH 07/11] Delete 3825-validate-genesis-before-running-gentx --- .../bugfixes/gaiacli/3825-validate-genesis-before-running-gentx | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx diff --git a/.pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx b/.pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx deleted file mode 100644 index 3575f7aa394f..000000000000 --- a/.pending/bugfixes/gaiacli/3825-validate-genesis-before-running-gentx +++ /dev/null @@ -1 +0,0 @@ -#3825 validate genesis before running gentx \ No newline at end of file From 97cf6c5dd7356f079fbf7576059a21c50d2321c6 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Thu, 21 Mar 2019 15:36:03 +0100 Subject: [PATCH 08/11] Update cmd/gaia/init/gentx.go Co-Authored-By: sabau --- cmd/gaia/init/gentx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index 2ff298758e07..eb97dbc4a924 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -238,7 +238,7 @@ func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins s } func prepareFlagsForTxCreateValidator(config *cfg.Config, nodeID, ip, chainID string, - valPubKey crypto.PubKey, website string, details string, identity string) { + valPubKey crypto.PubKey, website, details, identity string) { viper.Set(tmcli.HomeFlag, viper.GetString(flagClientHome)) // --home viper.Set(client.FlagChainID, chainID) viper.Set(client.FlagFrom, viper.GetString(client.FlagName)) // --from From 3f50f8814ec9d2579dfcd87b2fcb9e3920fc2fa8 Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Thu, 21 Mar 2019 15:37:45 +0100 Subject: [PATCH 09/11] removed unnecessary comments --- cmd/gaia/init/gentx.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index eb97dbc4a924..d551a38fe8c8 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -108,13 +108,8 @@ following delegation and commission default parameters: } } - // Read --website (optional) website := viper.GetString(cli.FlagWebsite) - - // Read --details (optional) details := viper.GetString(cli.FlagDetails) - - // Read --identity (optional) identity := viper.GetString(cli.FlagIdentity) // Set flags for creating gentx From b8d6f2ac1881edef5e1d14b66f2438b6ac9d85aa Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Wed, 27 Mar 2019 11:49:19 +0100 Subject: [PATCH 10/11] fix merge Signed-off-by: Karoly Albert Szabo --- cmd/gaia/init/gentx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index ec57da7bd8eb..7e6a4a45b1d6 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -245,8 +245,7 @@ func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins s } func prepareFlagsForTxCreateValidator( - config *cfg.Config, nodeID, ip, chainID string, valPubKey crypto.PubKey, - website, details, identity string + config *cfg.Config, nodeID, ip, chainID string, valPubKey crypto.PubKey, website, details, identity string, ) { viper.Set(tmcli.HomeFlag, viper.GetString(flagClientHome)) viper.Set(client.FlagChainID, chainID) From 3837dad74f12417100e1e40883ed18be3b095bbf Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Wed, 27 Mar 2019 12:04:31 +0100 Subject: [PATCH 11/11] re-fix merge conflicts Signed-off-by: Karoly Albert Szabo --- cmd/gaia/init/gentx.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index 7e6a4a45b1d6..970c77e0d861 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -253,7 +253,6 @@ func prepareFlagsForTxCreateValidator( viper.Set(cli.FlagNodeID, nodeID) viper.Set(cli.FlagIP, ip) viper.Set(cli.FlagPubKey, sdk.MustBech32ifyConsPub(valPubKey)) - viper.Set(client.FlagGenerateOnly, true) viper.Set(cli.FlagMoniker, config.Moniker) viper.Set(cli.FlagWebsite, website) viper.Set(cli.FlagDetails, details)