From 3ff2738967fe7a1fa52e7316ac13c299539f6570 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Thu, 21 Dec 2023 18:46:22 +0100
Subject: [PATCH] fix: add MsgPruneAcknowledgements to codec registration
 (#5481)

(cherry picked from commit 947b15ed0e3d2130e5bc9763ce623f6cbb7aa74a)

# Conflicts:
#	modules/core/04-channel/types/codec.go
---
 modules/core/04-channel/types/codec.go      | 12 ++++++
 modules/core/04-channel/types/codec_test.go | 45 +++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/modules/core/04-channel/types/codec.go b/modules/core/04-channel/types/codec.go
index 86f2f495d19..6e3e8fc2385 100644
--- a/modules/core/04-channel/types/codec.go
+++ b/modules/core/04-channel/types/codec.go
@@ -39,6 +39,18 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 		&MsgAcknowledgement{},
 		&MsgTimeout{},
 		&MsgTimeoutOnClose{},
+<<<<<<< HEAD
+=======
+		&MsgChannelUpgradeInit{},
+		&MsgChannelUpgradeTry{},
+		&MsgChannelUpgradeAck{},
+		&MsgChannelUpgradeConfirm{},
+		&MsgChannelUpgradeOpen{},
+		&MsgChannelUpgradeTimeout{},
+		&MsgChannelUpgradeCancel{},
+		&MsgPruneAcknowledgements{},
+		&MsgUpdateParams{},
+>>>>>>> 947b15ed (fix: add MsgPruneAcknowledgements to codec registration (#5481))
 	)
 
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
diff --git a/modules/core/04-channel/types/codec_test.go b/modules/core/04-channel/types/codec_test.go
index 9122a95df0a..fab8d9e5bd0 100644
--- a/modules/core/04-channel/types/codec_test.go
+++ b/modules/core/04-channel/types/codec_test.go
@@ -83,6 +83,51 @@ func TestCodecTypeRegistration(t *testing.T) {
 			sdk.MsgTypeURL(&types.MsgTimeoutOnClose{}),
 			true,
 		},
+		{
+			"success: MsgChannelUpgradeInit",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeInit{}),
+			true,
+		},
+		{
+			"success: MsgChannelUpgradeTry",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeTry{}),
+			true,
+		},
+		{
+			"success: MsgChannelUpgradeAck",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeAck{}),
+			true,
+		},
+		{
+			"success: MsgChannelUpgradeConfirm",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeConfirm{}),
+			true,
+		},
+		{
+			"success: MsgChannelUpgradeOpen",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeOpen{}),
+			true,
+		},
+		{
+			"success: MsgChannelUpgradeTimeout",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeTimeout{}),
+			true,
+		},
+		{
+			"success: MsgChannelUpgradeCancel",
+			sdk.MsgTypeURL(&types.MsgChannelUpgradeCancel{}),
+			true,
+		},
+		{
+			"success: MsgPruneAcknowledgements",
+			sdk.MsgTypeURL(&types.MsgPruneAcknowledgements{}),
+			true,
+		},
+		{
+			"success: MsgUpdateParams",
+			sdk.MsgTypeURL(&types.MsgUpdateParams{}),
+			true,
+		},
 		{
 			"type not registered on codec",
 			"ibc.invalid.MsgTypeURL",