From 58b3089ecdaf64cf25d6765f1d14fea05e84b9cc Mon Sep 17 00:00:00 2001
From: Ruaridh <rhuairahrighairidh@users.noreply.github.com>
Date: Wed, 11 Aug 2021 05:56:19 +0100
Subject: [PATCH] Remove unnecessary msg field in incentive (#988)

* remove msg field that was forgotten

* fix cli tx example text
---
 x/incentive/client/cli/tx.go | 12 ++++++------
 x/incentive/types/msg.go     |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/x/incentive/client/cli/tx.go b/x/incentive/client/cli/tx.go
index dd12b067..a15bcd0d 100644
--- a/x/incentive/client/cli/tx.go
+++ b/x/incentive/client/cli/tx.go
@@ -213,8 +213,8 @@ func getCmdClaimDelegatorVVesting(cdc *codec.Codec) *cobra.Command {
 		Long: `Claim sender's outstanding delegator rewards on behalf of a validator vesting account using given multipliers
 A receiver address for the rewards is needed as validator vesting accounts cannot receive locked tokens.`,
 		Example: strings.Join([]string{
-			fmt.Sprintf("  $ %s tx %s claim-hard-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s hard=large --%s swp=small", version.ClientName, types.ModuleName, multiplierFlag, multiplierFlag),
-			fmt.Sprintf("  $ %s tx %s claim-hard-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s hard=large,swp=small", version.ClientName, types.ModuleName, multiplierFlag),
+			fmt.Sprintf("  $ %s tx %s claim-delegator-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s hard=large --%s swp=small", version.ClientName, types.ModuleName, multiplierFlag, multiplierFlag),
+			fmt.Sprintf("  $ %s tx %s claim-delegator-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s hard=large,swp=small", version.ClientName, types.ModuleName, multiplierFlag),
 		}, "\n"),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -250,8 +250,8 @@ func getCmdClaimSwap(cdc *codec.Codec) *cobra.Command {
 		Short: "claim sender's swap rewards using given multipliers",
 		Long:  `Claim sender's outstanding swap rewards using given multipliers`,
 		Example: strings.Join([]string{
-			fmt.Sprintf(`  $ %s tx %s claim-hard --%s swp=large --%s ukava=small`, version.ClientName, types.ModuleName, multiplierFlag, multiplierFlag),
-			fmt.Sprintf(`  $ %s tx %s claim-hard --%s swp=large,ukava=small`, version.ClientName, types.ModuleName, multiplierFlag),
+			fmt.Sprintf(`  $ %s tx %s claim-swap --%s swp=large --%s ukava=small`, version.ClientName, types.ModuleName, multiplierFlag, multiplierFlag),
+			fmt.Sprintf(`  $ %s tx %s claim-swap --%s swp=large,ukava=small`, version.ClientName, types.ModuleName, multiplierFlag),
 		}, "\n"),
 		Args: cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -283,8 +283,8 @@ func getCmdClaimSwapVVesting(cdc *codec.Codec) *cobra.Command {
 		Long: `Claim sender's outstanding swap rewards on behalf of a validator vesting account using given multipliers
 A receiver address for the rewards is needed as validator vesting accounts cannot receive locked tokens.`,
 		Example: strings.Join([]string{
-			fmt.Sprintf("  $ %s tx %s claim-hard-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s ukava=large --%s swp=small", version.ClientName, types.ModuleName, multiplierFlag, multiplierFlag),
-			fmt.Sprintf("  $ %s tx %s claim-hard-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s ukava=large,swp=small", version.ClientName, types.ModuleName, multiplierFlag),
+			fmt.Sprintf("  $ %s tx %s claim-swap-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s ukava=large --%s swp=small", version.ClientName, types.ModuleName, multiplierFlag, multiplierFlag),
+			fmt.Sprintf("  $ %s tx %s claim-swap-vesting kava15qdefkmwswysgg4qxgqpqr35k3m49pkx2jdfnw --%s ukava=large,swp=small", version.ClientName, types.ModuleName, multiplierFlag),
 		}, "\n"),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/x/incentive/types/msg.go b/x/incentive/types/msg.go
index 64df59bc..8c33cf8c 100644
--- a/x/incentive/types/msg.go
+++ b/x/incentive/types/msg.go
@@ -296,9 +296,8 @@ func (msg MsgClaimDelegatorRewardVVesting) GetSigners() []sdk.AccAddress {
 
 // MsgClaimSwapReward message type used to claim delegator rewards
 type MsgClaimSwapReward struct {
-	Sender         sdk.AccAddress `json:"sender" yaml:"sender"`
-	MultiplierName string         `json:"multiplier_name" yaml:"multiplier_name"`
-	DenomsToClaim  Selections     `json:"denoms_to_claim" yaml:"denoms_to_claim"`
+	Sender        sdk.AccAddress `json:"sender" yaml:"sender"`
+	DenomsToClaim Selections     `json:"denoms_to_claim" yaml:"denoms_to_claim"`
 }
 
 // NewMsgClaimSwapReward returns a new MsgClaimSwapReward.