From 25432d522af9e01bcee2ba892c2b38a8bd59ecea Mon Sep 17 00:00:00 2001 From: beer-1 <147697694+beer-1@users.noreply.github.com> Date: Tue, 26 Mar 2024 18:15:06 +0900 Subject: [PATCH] remove unused --- app/ibc-hooks/receive.go | 20 ++++++++++---------- app/ibc-hooks/util.go | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/ibc-hooks/receive.go b/app/ibc-hooks/receive.go index 1fcebd8..490ce65 100644 --- a/app/ibc-hooks/receive.go +++ b/app/ibc-hooks/receive.go @@ -27,19 +27,19 @@ func (h WasmHooks) onRecvIcs20Packet( if !isWasmRouted || hookData.Message == nil { return im.App.OnRecvPacket(ctx, packet, relayer) } else if err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } msg := hookData.Message if allowed, err := h.checkACL(im, ctx, msg.Contract); err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } else if !allowed { return im.App.OnRecvPacket(ctx, packet, relayer) } // Validate whether the receiver is correctly specified or not. if err := validateReceiver(msg, data.Receiver); err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } // Calculate the receiver / contract caller based on the packet's channel and sender @@ -54,7 +54,7 @@ func (h WasmHooks) onRecvIcs20Packet( data.Receiver = intermediateSender bz, err := json.Marshal(data) if err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } packet.Data = bz @@ -66,7 +66,7 @@ func (h WasmHooks) onRecvIcs20Packet( msg.Sender = intermediateSender _, err = h.execMsg(ctx, msg) if err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } return ack @@ -83,19 +83,19 @@ func (h WasmHooks) onRecvIcs721Packet( if !isWasmRouted || hookData.Message == nil { return im.App.OnRecvPacket(ctx, packet, relayer) } else if err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } msg := hookData.Message if allowed, err := h.checkACL(im, ctx, msg.Contract); err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } else if !allowed { return im.App.OnRecvPacket(ctx, packet, relayer) } // Validate whether the receiver is correctly specified or not. if err := validateReceiver(msg, data.Receiver); err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } // Calculate the receiver / contract caller based on the packet's channel and sender @@ -110,7 +110,7 @@ func (h WasmHooks) onRecvIcs721Packet( data.Receiver = intermediateSender bz, err := json.Marshal(data) if err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } packet.Data = bz @@ -122,7 +122,7 @@ func (h WasmHooks) onRecvIcs721Packet( msg.Sender = intermediateSender _, err = h.execMsg(ctx, msg) if err != nil { - return newEmitErrorAcknowledgement(ctx, err) + return newEmitErrorAcknowledgement(err) } return ack diff --git a/app/ibc-hooks/util.go b/app/ibc-hooks/util.go index 0c9382a..702408b 100644 --- a/app/ibc-hooks/util.go +++ b/app/ibc-hooks/util.go @@ -115,7 +115,7 @@ func jsonStringHasKey(memo, key string) (found bool, jsonObject map[string]inter // newEmitErrorAcknowledgement creates a new error acknowledgement after having emitted an event with the // details of the error. -func newEmitErrorAcknowledgement(ctx sdk.Context, err error) channeltypes.Acknowledgement { +func newEmitErrorAcknowledgement(err error) channeltypes.Acknowledgement { return channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Error{ Error: fmt.Sprintf("ibc wasm hook error: %s", err.Error()),