various fixes

modules/apps/29-fee/types/fee.go

@@ -67,15 +67,15 @@ func (f Fee) Total() sdk.Coins {
 }
 
 // Validate asserts that each Fee is valid and all three Fees are not empty or zero
-func (fee Fee) Validate() error {
+func (f Fee) Validate() error {
 	var errFees []string
-	if !fee.AckFee.IsValid() {
+	if !f.AckFee.IsValid() {
 		errFees = append(errFees, "ack fee invalid")
 	}
-	if !fee.RecvFee.IsValid() {
+	if !f.RecvFee.IsValid() {
 		errFees = append(errFees, "recv fee invalid")
 	}
-	if !fee.TimeoutFee.IsValid() {
+	if !f.TimeoutFee.IsValid() {
 		errFees = append(errFees, "timeout fee invalid")
 	}
 
@@ -84,7 +84,7 @@ func (fee Fee) Validate() error {
 	}
 
 	// if all three fee's are zero or empty return an error
-	if fee.AckFee.IsZero() && fee.RecvFee.IsZero() && fee.TimeoutFee.IsZero() {
+	if f.AckFee.IsZero() && f.RecvFee.IsZero() && f.TimeoutFee.IsZero() {
 		return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, "all fees are zero")
 	}
 

modules/apps/transfer/types/trace.go

@@ -81,7 +81,7 @@ func extractPathAndBaseFromFullDenom(fullDenomItems []string) (string, string) {
 	var path []string
 	var baseDenom []string
 	length := len(fullDenomItems)
-	for i := 0; i < length; i = i + 2 {
+	for i := 0; i < length; i += 2 {
 		if i < length-1 && length > 2 && fullDenomItems[i] == PortID {
 			path = append(path, fullDenomItems[i], fullDenomItems[i+1])
 		} else {

modules/core/02-client/legacy/v100/store.go

@@ -11,7 +11,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
 	clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 	"github.com/cosmos/ibc-go/v5/modules/core/exported"
@@ -46,7 +45,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar
 	}
 
 	for _, clientID := range clients {
-		clientType, _, err := types.ParseClientIdentifier(clientID)
+		clientType, _, err := clienttypes.ParseClientIdentifier(clientID)
 		if err != nil {
 			return err
 		}
@@ -91,7 +90,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar
 
 			tmClientState, ok := clientState.(*ibctmtypes.ClientState)
 			if !ok {
-				return sdkerrors.Wrap(types.ErrInvalidClient, "client state is not tendermint even though client id contains 07-tendermint")
+				return sdkerrors.Wrap(clienttypes.ErrInvalidClient, "client state is not tendermint even though client id contains 07-tendermint")
 			}
 
 			// add iteration keys so pruning will be successful
@@ -143,7 +142,7 @@ func pruneSolomachineConsensusStates(clientStore sdk.KVStore) {
 		}
 
 		// collect consensus states to be pruned
-		heights = append(heights, types.MustParseHeight(keySplit[1]))
+		heights = append(heights, clienttypes.MustParseHeight(keySplit[1]))
 	}
 
 	// delete all consensus states
@@ -167,7 +166,7 @@ func addConsensusMetadata(ctx sdk.Context, clientStore sdk.KVStore, cdc codec.Bi
 			continue
 		}
 
-		heights = append(heights, types.MustParseHeight(keySplit[1]))
+		heights = append(heights, clienttypes.MustParseHeight(keySplit[1]))
 	}
 
 	for _, height := range heights {

modules/core/04-channel/types/events.go

@@ -22,9 +22,9 @@ const (
 	EventTypeTimeoutPacket        = "timeout_packet"
 	EventTypeTimeoutPacketOnClose = "timeout_on_close_packet"
 
-	// NOTE: DEPRECATED in favor of AttributeKeyDataHex
+	// Deprecated: in favor of AttributeKeyDataHex
 	AttributeKeyData = "packet_data"
-	// NOTE: DEPRECATED in favor of AttributeKeyAckHex
+	// Deprecated: in favor of AttributeKeyAckHex
 	AttributeKeyAck = "packet_ack"
 
 	AttributeKeyDataHex          = "packet_data_hex"

modules/core/ante/ante.go

@@ -35,39 +35,39 @@ func (ad AnteDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 					return ctx, err
 				}
 				if response.Result == channeltypes.NOOP {
-					redundancies += 1
+					redundancies++
 				}
-				packetMsgs += 1
+				packetMsgs++
 
 			case *channeltypes.MsgAcknowledgement:
 				response, err := ad.k.Acknowledgement(sdk.WrapSDKContext(ctx), msg)
 				if err != nil {
 					return ctx, err
 				}
 				if response.Result == channeltypes.NOOP {
-					redundancies += 1
+					redundancies++
 				}
-				packetMsgs += 1
+				packetMsgs++
 
 			case *channeltypes.MsgTimeout:
 				response, err := ad.k.Timeout(sdk.WrapSDKContext(ctx), msg)
 				if err != nil {
 					return ctx, err
 				}
 				if response.Result == channeltypes.NOOP {
-					redundancies += 1
+					redundancies++
 				}
-				packetMsgs += 1
+				packetMsgs++
 
 			case *channeltypes.MsgTimeoutOnClose:
 				response, err := ad.k.TimeoutOnClose(sdk.WrapSDKContext(ctx), msg)
 				if err != nil {
 					return ctx, err
 				}
 				if response.Result == channeltypes.NOOP {
-					redundancies += 1
+					redundancies++
 				}
-				packetMsgs += 1
+				packetMsgs++
 
 			case *clienttypes.MsgUpdateClient:
 				_, err := ad.k.UpdateClient(sdk.WrapSDKContext(ctx), msg)

modules/light-clients/07-tendermint/types/misbehaviour_handle.go

@@ -51,12 +51,11 @@ func (cs ClientState) CheckMisbehaviourAndUpdateState(
 		if bytes.Equal(blockID1.Hash, blockID2.Hash) {
 			return nil, sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "headers block hashes are equal")
 		}
-	} else {
-		// Header1 is at greater height than Header2, therefore Header1 time must be less than or equal to
-		// Header2 time in order to be valid misbehaviour (violation of monotonic time).
-		if tmMisbehaviour.Header1.SignedHeader.Header.Time.After(tmMisbehaviour.Header2.SignedHeader.Header.Time) {
-			return nil, sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "headers are not at same height and are monotonically increasing")
-		}
+	}
+	// Header1 is at greater height than Header2, therefore Header1 time must be less than or equal to
+	// Header2 time in order to be valid misbehaviour (violation of monotonic time).
+	if tmMisbehaviour.Header1.SignedHeader.Header.Time.After(tmMisbehaviour.Header2.SignedHeader.Header.Time) {
+		return nil, sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "headers are not at same height and are monotonically increasing")
 	}
 
 	// Regardless of the type of misbehaviour, ensure that both headers are valid and would have been accepted by light-client

testing/simapp/simd/cmd/genaccounts.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -41,7 +40,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			depCdc := clientCtx.Codec
-			cdc := depCdc.(codec.Codec)
+			cdc := depCdc
 
 			serverCtx := server.GetServerContextFromCmd(cmd)
 			config := serverCtx.Config

testing/simapp/simd/cmd/testnet.go

@@ -381,7 +381,7 @@ func calculateIP(ip string, i int) (string, error) {
 }
 
 func writeFile(name string, dir string, contents []byte) error {
-	writePath := filepath.Join(dir)
+	writePath := filepath.Dir(dir)
 	file := filepath.Join(writePath, name)
 
 	err := tmos.EnsureDir(writePath, 0o755)

testing/values.go

@@ -1,6 +1,6 @@
 /*
-	This file contains the variables, constants, and default values
-	used in the testing package and commonly defined in tests.
+This file contains the variables, constants, and default values
+used in the testing package and commonly defined in tests.
 */
 package ibctesting