pr nits

e2e/tests/core/02-client/client_test.go

@@ -120,10 +120,11 @@ func (s *ClientTestSuite) TestScheduleIBCUpgrade_Succeeds() {
 		cs, err := s.QueryUpgradedClientState(ctx, chainA, ibctesting.FirstClientID)
 		s.Require().NoError(err)
 
-		upgradedClientState := cs.(*ibctm.ClientState)
+		upgradedClientState, ok := cs.(*ibctm.ClientState)
+		s.Require().True(ok)
 		s.Require().Equal(upgradedClientState.ChainId, newChainID)
 
-		plan, err := s.QueryCurrentPlan(ctx, chainA)
+		plan, err := s.QueryCurrentUpgradePlan(ctx, chainA)
 		s.Require().NoError(err)
 
 		s.Require().Equal("upgrade-client", plan.Name)
@@ -142,7 +143,7 @@ func (s *ClientTestSuite) TestRecoverClient_Succeeds() {
 		subjectClientID    string
 		substituteClientID string
 		// set the trusting period to a value which will still be valid upon client creation, but invalid before the first update
-		badTrustingPeriod = time.Duration(time.Second * 10)
+		badTrustingPeriod = time.Second * 10
 	)
 
 	t.Run("create substitute client with correct trusting period", func(t *testing.T) {
@@ -198,6 +199,7 @@ func (s *ClientTestSuite) TestRecoverClient_Succeeds() {
 		authority, err := s.QueryModuleAccountAddress(ctx, govtypes.ModuleName, chainA)
 		s.Require().NoError(err)
 		recoverClientMsg := clienttypes.NewMsgRecoverClient(authority.String(), subjectClientID, substituteClientID)
+		s.Require().NotNil(recoverClientMsg)
 		s.ExecuteGovV1Proposal(ctx, recoverClientMsg, chainA, chainAWallet, 1)
 	})
 

e2e/testsuite/grpc_query.go

@@ -153,8 +153,8 @@ func (s *E2ETestSuite) QueryClientStatus(ctx context.Context, chain ibc.Chain, c
 	return res.Status, nil
 }
 
-// QueryCurrentPlan queries the currently scheduled plans, if any
-func (s *E2ETestSuite) QueryCurrentPlan(ctx context.Context, chain ibc.Chain) (upgradetypes.Plan, error) {
+// QueryCurrentUpgradePlan queries the currently scheduled upgrade plans.
+func (s *E2ETestSuite) QueryCurrentUpgradePlan(ctx context.Context, chain ibc.Chain) (upgradetypes.Plan, error) {
 	queryClient := s.GetChainGRCPClients(chain).UpgradeQueryClient
 	res, err := queryClient.CurrentPlan(ctx, &upgradetypes.QueryCurrentPlanRequest{})
 	if err != nil {

modules/apps/27-interchain-accounts/simulation/proposals.go

@@ -36,7 +36,7 @@ func ProposalMsgs() []simtypes.WeightedProposalMsg {
 }
 
 // SimulateHostMsgUpdateParams returns a random MsgUpdateParams for the host module
-func SimulateHostMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
+func SimulateHostMsgUpdateParams(_ *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
 	var signer sdk.AccAddress = address.Module("gov")
 	params := types.DefaultParams()
 	params.HostEnabled = false
@@ -48,7 +48,7 @@ func SimulateHostMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Accou
 }
 
 // SimulateControllerMsgUpdateParams returns a random MsgUpdateParams for the controller module
-func SimulateControllerMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
+func SimulateControllerMsgUpdateParams(_ *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
 	var signer sdk.AccAddress = address.Module("gov")
 	params := controllertypes.DefaultParams()
 	params.ControllerEnabled = false

modules/apps/transfer/simulation/proposals.go

@@ -30,13 +30,13 @@ func ProposalMsgs() []simtypes.WeightedProposalMsg {
 }
 
 // SimulateMsgUpdateParams returns a random MsgUpdateParams
-func SimulateMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
-	var signer sdk.AccAddress = address.Module("gov")
+func SimulateMsgUpdateParams(_ *rand.Rand, _ sdk.Context, _ []simtypes.Account) sdk.Msg {
+	var gov sdk.AccAddress = address.Module("gov")
 	params := types.DefaultParams()
 	params.SendEnabled = false
 
 	return &types.MsgUpdateParams{
-		Signer: signer.String(),
+		Signer: gov.String(),
 		Params: params,
 	}
 }

modules/core/02-client/client/cli/cli.go

@@ -44,10 +44,10 @@ func NewTxCmd() *cobra.Command {
 	}
 
 	txCmd.AddCommand(
-		NewCreateClientCmd(),
-		NewUpdateClientCmd(),
-		NewSubmitMisbehaviourCmd(), // Deprecated
-		NewUpgradeClientCmd(),
+		newCreateClientCmd(),
+		newUpdateClientCmd(),
+		newSubmitMisbehaviourCmd(), // Deprecated
+		newUpgradeClientCmd(),
 		newSubmitRecoverClientProposalCmd(),
 		newScheduleIBCUpgradeProposalCmd(),
 	)

modules/core/02-client/client/cli/tx.go

@@ -25,8 +25,8 @@ import (
 
 const FlagAuthority = "authority"
 
-// NewCreateClientCmd defines the command to create a new IBC light client.
-func NewCreateClientCmd() *cobra.Command {
+// newCreateClientCmd defines the command to create a new IBC light client.
+func newCreateClientCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "create [path/to/client_state.json] [path/to/consensus_state.json]",
 		Short: "create new IBC client",
@@ -87,8 +87,8 @@ func NewCreateClientCmd() *cobra.Command {
 	return cmd
 }
 
-// NewUpdateClientCmd defines the command to update an IBC client.
-func NewUpdateClientCmd() *cobra.Command {
+// newUpdateClientCmd defines the command to update an IBC client.
+func newUpdateClientCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "update [client-id] [path/to/client_msg.json]",
 		Short:   "update existing client with a client message",
@@ -132,11 +132,11 @@ func NewUpdateClientCmd() *cobra.Command {
 	return cmd
 }
 
-// NewSubmitMisbehaviourCmd defines the command to submit a misbehaviour to prevent
+// newSubmitMisbehaviourCmd defines the command to submit a misbehaviour to prevent
 // future updates.
 // Deprecated: NewSubmitMisbehaviourCmd is deprecated and will be removed in a future release.
 // Please use NewUpdateClientCmd instead.
-func NewSubmitMisbehaviourCmd() *cobra.Command {
+func newSubmitMisbehaviourCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "misbehaviour [clientID] [path/to/misbehaviour.json]",
 		Short:   "submit a client misbehaviour",
@@ -179,8 +179,8 @@ func NewSubmitMisbehaviourCmd() *cobra.Command {
 	return cmd
 }
 
-// NewUpgradeClientCmd defines the command to upgrade an IBC light client.
-func NewUpgradeClientCmd() *cobra.Command {
+// newUpgradeClientCmd defines the command to upgrade an IBC light client.
+func newUpgradeClientCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "upgrade [client-identifier] [path/to/client_state.json] [path/to/consensus_state.json] [upgrade-client-proof] [upgrade-consensus-state-proof]",
 		Short: "upgrade an IBC client",
@@ -245,15 +245,15 @@ func NewUpgradeClientCmd() *cobra.Command {
 	return cmd
 }
 
-// newSubmitRecoverClientProposalCmd defines the command to recover an IBC light client
+// newSubmitRecoverClientProposalCmd defines the command to recover an IBC light client.
 func newSubmitRecoverClientProposalCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "recover-client [subject-client-id] [substitute-client-id] [flags]",
 		Args:  cobra.ExactArgs(2),
 		Short: "recover an IBC client",
-		Long: "Submit a recover IBC client proposal along with an initial deposit.\n" +
-			"Please specify a subject client identifier you want to recover.\n" +
-			"Please specify the substitute client the subject client will be recovered to.",
+		Long: `Submit a recover IBC client proposal along with an initial deposit
+		Please specify a subject client identifier you want to recover
+		Please specify the substitute client the subject client will be recovered to.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {

modules/core/02-client/keeper/client.go

@@ -185,7 +185,7 @@ func (k Keeper) RecoverClient(ctx sdk.Context, subjectClientID, substituteClient
 	}
 
 	if err := subjectClientState.CheckSubstituteAndUpdateState(ctx, k.cdc, subjectClientStore, substituteClientStore, substituteClientState); err != nil {
-		return err
+		return errorsmod.Wrapf(types.ErrValidatingSubstituteClient, "failed to validate substitute client: %s", err)
 	}
 
 	k.Logger(ctx).Info("client recovered", "client-id", subjectClientID)

modules/core/02-client/types/errors.go

@@ -36,4 +36,6 @@ var (
 	ErrClientNotActive                        = errorsmod.Register(SubModuleName, 29, "client state is not active")
 	ErrFailedMembershipVerification           = errorsmod.Register(SubModuleName, 30, "membership verification failed")
 	ErrFailedNonMembershipVerification        = errorsmod.Register(SubModuleName, 31, "non-membership verification failed")
+	ErrSchedulingIBCUpgrade                   = errorsmod.Register(SubModuleName, 32, "failed to schedule IBC upgrade")
+	ErrValidatingSubstituteClient             = errorsmod.Register(SubModuleName, 33, "failed to validate substitute client")
 )

modules/core/keeper/msg_server.go

@@ -127,7 +127,7 @@ func (k Keeper) IBCSoftwareUpgrade(goCtx context.Context, msg *clienttypes.MsgIB
 	}
 
 	if err = k.ClientKeeper.ScheduleIBCSoftwareUpgrade(ctx, msg.Plan, upgradedClientState); err != nil {
-		return nil, errorsmod.Wrapf(err, "cannot schedule IBC client upgrade")
+		return nil, errorsmod.Wrapf(clienttypes.ErrSchedulingIBCUpgrade, "cannot schedule IBC client upgrade: %s", err)
 	}
 
 	return &clienttypes.MsgIBCSoftwareUpgradeResponse{}, nil