Merge pull request #490 from icon-project/fix/improper-err-handle

fix: proper error check and return
icon-project · Feb 24, 2025 · 10d1eac · 10d1eac
2 parents 267a06d + 71a591b
commit 10d1eac
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/relayer/relay.go b/relayer/relay.go
@@ -306,19 +306,21 @@ func (r *Relayer) processClusterEvents(ctx context.Context, message *types.Route
 	switch message.EventType {
 	case events.EmitMessage:
 		srcChainProvider, err := r.FindChainRuntime(message.Src)
-		message.DstConnAddress = dst.Provider.Config().GetConnContract()
-		message.Message.SrcConnAddress = srcChainProvider.Provider.Config().GetConnContract()
-		iconChain := getIconChain(r.chains)
 		if err != nil {
-			r.log.Error("wrapped src chain nid not found", zap.String("nid", message.Src))
+			r.log.Error("wrapped src chain runtime not found", zap.String("nid", message.Src))
 			r.ClearMessages(ctx, []*types.MessageKey{message.MessageKey()}, src)
+			return
 		}
+		message.DstConnAddress = dst.Provider.Config().GetConnContract()
+		message.Message.SrcConnAddress = srcChainProvider.Provider.Config().GetConnContract()
+		iconChain := getIconChain(r.chains)
 		go r.processAcknowledgementMsg(ctx, message, srcChainProvider, dst, iconChain, true)
 	case events.PacketRegistered:
 		srcChainProvider, err := r.FindChainRuntime(message.Src)
 		if err != nil {
-			r.log.Error("wrapped src chain nid not found", zap.String("nid", message.Src))
+			r.log.Error("wrapped src chain runtime not found", zap.String("nid", message.Src))
 			r.ClearMessages(ctx, []*types.MessageKey{message.MessageKey()}, src)
+			return
 		}
 		iconChain := getIconChain(r.chains)
 		go r.processAcknowledgementMsg(ctx, message, srcChainProvider, dst, iconChain, false)