nits: remove unnecessary errors, add mock upgrade version

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

@@ -37,13 +37,11 @@ var (
 	// Perform a no-op on the current Msg
 	ErrNoOpMsg = errorsmod.Register(SubModuleName, 23, "message is redundant, no-op will be performed")
 
-	ErrInvalidChannelVersion   = errorsmod.Register(SubModuleName, 24, "invalid channel version")
-	ErrPacketNotSent           = errorsmod.Register(SubModuleName, 25, "packet has not been sent")
-	ErrInvalidTimeout          = errorsmod.Register(SubModuleName, 26, "invalid packet timeout")
-	ErrInvalidUpgradeTimeout   = errorsmod.Register(SubModuleName, 27, "either timeout height or timeout timestamp must be non-zero")
-	ErrUpgradeSequenceNotFound = errorsmod.Register(SubModuleName, 28, "upgrade sequence not found")
-	ErrUpgradeErrorNotFound    = errorsmod.Register(SubModuleName, 29, "upgrade error receipt not found")
-	ErrInvalidUpgrade          = errorsmod.Register(SubModuleName, 30, "invalid upgrade")
-	ErrInvalidUpgradeSequence  = errorsmod.Register(SubModuleName, 31, "invalid upgrade sequence")
-	ErrUpgradeNotFound         = errorsmod.Register(SubModuleName, 32, "upgrade not found")
+	ErrInvalidChannelVersion  = errorsmod.Register(SubModuleName, 24, "invalid channel version")
+	ErrPacketNotSent          = errorsmod.Register(SubModuleName, 25, "packet has not been sent")
+	ErrInvalidTimeout         = errorsmod.Register(SubModuleName, 26, "invalid packet timeout")
+	ErrUpgradeErrorNotFound   = errorsmod.Register(SubModuleName, 27, "upgrade error receipt not found")
+	ErrInvalidUpgrade         = errorsmod.Register(SubModuleName, 28, "invalid upgrade")
+	ErrInvalidUpgradeSequence = errorsmod.Register(SubModuleName, 29, "invalid upgrade sequence")
+	ErrUpgradeNotFound        = errorsmod.Register(SubModuleName, 30, "upgrade not found")
 )

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

@@ -572,8 +572,8 @@ func (msg MsgChannelUpgradeTry) ValidateBasic() error {
 		return errorsmod.Wrap(ErrInvalidUpgrade, "proposed connection hops cannot be empty")
 	}
 
-	if msg.UpgradeTimeout.Height.IsZero() && msg.UpgradeTimeout.Timestamp == 0 {
-		return errorsmod.Wrap(ErrInvalidUpgradeTimeout, "timeout height or timeout timestamp must be non-zero")
+	if !msg.UpgradeTimeout.IsValid() {
+		return errorsmod.Wrap(ErrInvalidTimeout, "upgrade timeout height or timeout timestamp must be non-zero")
 	}
 
 	if err := msg.CounterpartyProposedUpgrade.ValidateBasic(); err != nil {

testing/mock/mock.go

@@ -36,6 +36,7 @@ var (
 	MockRecvCanaryCapabilityName    = "mock receive canary capability name"
 	MockAckCanaryCapabilityName     = "mock acknowledgement canary capability name"
 	MockTimeoutCanaryCapabilityName = "mock timeout canary capability name"
+	UpgradeVersion                  = fmt.Sprintf("%s-v2", Version)
 )
 
 var _ porttypes.IBCModule = IBCModule{}