From 0bac8422dcb4dabf7024713b582a9499c2f5db48 Mon Sep 17 00:00:00 2001
From: j75689 <j75689@gmail.com>
Date: Wed, 29 Nov 2023 11:06:39 +0800
Subject: [PATCH] fix: redefine close channel events

---
 x/ibc/endblock.go | 16 ++++++++--------
 x/ibc/events.go   |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/x/ibc/endblock.go b/x/ibc/endblock.go
index ce691e561..11d4d1d5c 100644
--- a/x/ibc/endblock.go
+++ b/x/ibc/endblock.go
@@ -63,17 +63,17 @@ func closeChannelOnSideChanAndKeeper(ctx sdk.Context, k Keeper,
 	var events sdk.Events
 	_, err := k.sideKeeper.SaveChannelSettingChangeToIbc(ctx, destChainID, channelID, sdk.ChannelForbidden)
 	if err != nil {
-		ctx.Logger().Error("closeSideChainChannels", "err", err.Error())
-		events.AppendEvent(sdk.NewEvent("failed to save channel setting change",
-			sdk.NewAttribute("sideChainId", fmt.Sprint(destChainID)),
-			sdk.NewAttribute("channelId", fmt.Sprint(channelID)),
-			sdk.NewAttribute("error", err.Error()),
+		ctx.Logger().Error("failed to save ibc channel change", "err", err.Error())
+		events.AppendEvent(sdk.NewEvent(EventTypeSaveIBCChannelSettingFailed,
+			sdk.NewAttribute(AttributeKeySideChainId, fmt.Sprint(destChainID)),
+			sdk.NewAttribute(AttributeKeyChannelId, fmt.Sprint(channelID)),
+			sdk.NewAttribute(AttributeKeyError, err.Error()),
 		))
 		return events
 	}
-	events.AppendEvent(sdk.NewEvent("succeed to save channel setting change",
-		sdk.NewAttribute("sideChainId", fmt.Sprint(destChainID)),
-		sdk.NewAttribute("channelId", fmt.Sprint(channelID)),
+	events.AppendEvent(sdk.NewEvent(EventTypeSaveIBCChannelSettingSucceed,
+		sdk.NewAttribute(AttributeKeySideChainId, fmt.Sprint(destChainID)),
+		sdk.NewAttribute(AttributeKeyChannelId, fmt.Sprint(channelID)),
 	))
 	// close bc side chain channel
 	k.sideKeeper.SetChannelSendPermission(ctx, destChainID, channelID, sdk.ChannelForbidden)
diff --git a/x/ibc/events.go b/x/ibc/events.go
index 30601f14f..cf6576829 100644
--- a/x/ibc/events.go
+++ b/x/ibc/events.go
@@ -6,6 +6,15 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+var (
+	EventTypeSaveIBCChannelSettingFailed  = "save_ibc_channel_setting_failed"
+	EventTypeSaveIBCChannelSettingSucceed = "save_ibc_channel_setting_succeed"
+
+	AttributeKeySideChainId = "side_chain_id"
+	AttributeKeyChannelId   = "channel_id"
+	AttributeKeyError       = "error"
+)
+
 const (
 	separator                    = "::"
 	ibcEventType                 = "IBCPackage"