From 1f8cc450c46eab2635e13e39bbb73dbced8da60c Mon Sep 17 00:00:00 2001
From: Anil Kumar Kammari <anil@vitwit.com>
Date: Fri, 24 Jul 2020 23:09:52 +0530
Subject: [PATCH] Add missing cancel-software-upgrade cmd (#6840)

* Add cancel software upgrade cmd

* add proposal cancel handler

* Fix gofmt
---
 simapp/app.go                        | 2 +-
 x/upgrade/client/cli/tx.go           | 2 ++
 x/upgrade/client/proposal_handler.go | 1 +
 x/upgrade/client/rest/tx.go          | 7 +++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/simapp/app.go b/simapp/app.go
index 6d194a3fd5..adccf030cd 100644
--- a/simapp/app.go
+++ b/simapp/app.go
@@ -93,7 +93,7 @@ var (
 		mint.AppModuleBasic{},
 		distr.AppModuleBasic{},
 		gov.NewAppModuleBasic(
-			paramsclient.ProposalHandler, distrclient.ProposalHandler, upgradeclient.ProposalHandler,
+			paramsclient.ProposalHandler, distrclient.ProposalHandler, upgradeclient.ProposalHandler, upgradeclient.CancelProposalHandler,
 		),
 		params.AppModuleBasic{},
 		crisis.AppModuleBasic{},
diff --git a/x/upgrade/client/cli/tx.go b/x/upgrade/client/cli/tx.go
index eaa85cfc51..877600713b 100644
--- a/x/upgrade/client/cli/tx.go
+++ b/x/upgrade/client/cli/tx.go
@@ -144,6 +144,8 @@ func NewCmdSubmitCancelUpgradeProposal() *cobra.Command {
 	cmd.Flags().String(cli.FlagTitle, "", "title of proposal")
 	cmd.Flags().String(cli.FlagDescription, "", "description of proposal")
 	cmd.Flags().String(cli.FlagDeposit, "", "deposit of proposal")
+	cmd.MarkFlagRequired(cli.FlagTitle)
+	cmd.MarkFlagRequired(cli.FlagDescription)
 	flags.AddTxFlagsToCmd(cmd)
 
 	return cmd
diff --git a/x/upgrade/client/proposal_handler.go b/x/upgrade/client/proposal_handler.go
index 7cf0f9d778..a4b64f7ac7 100644
--- a/x/upgrade/client/proposal_handler.go
+++ b/x/upgrade/client/proposal_handler.go
@@ -7,3 +7,4 @@ import (
 )
 
 var ProposalHandler = govclient.NewProposalHandler(cli.NewCmdSubmitUpgradeProposal, rest.ProposalRESTHandler)
+var CancelProposalHandler = govclient.NewProposalHandler(cli.NewCmdSubmitCancelUpgradeProposal, rest.ProposalCancelRESTHandler)
diff --git a/x/upgrade/client/rest/tx.go b/x/upgrade/client/rest/tx.go
index 2a242c2417..b07ced6cda 100644
--- a/x/upgrade/client/rest/tx.go
+++ b/x/upgrade/client/rest/tx.go
@@ -60,6 +60,13 @@ func ProposalRESTHandler(clientCtx client.Context) govrest.ProposalRESTHandler {
 	}
 }
 
+func ProposalCancelRESTHandler(clientCtx client.Context) govrest.ProposalRESTHandler {
+	return govrest.ProposalRESTHandler{
+		SubRoute: "upgrade",
+		Handler:  cancelPlanHandler(clientCtx),
+	}
+}
+
 // nolint
 func newPostPlanHandler(clientCtx client.Context, txg client.TxConfig, newMsgFn func() gov.MsgSubmitProposalI) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {