Skip to content

Commit

Permalink
remove unused
Browse files Browse the repository at this point in the history
  • Loading branch information
beer-1 committed Mar 26, 2024
1 parent 8c4578e commit 25432d5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions app/ibc-hooks/receive.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/ibc-hooks/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down

0 comments on commit 25432d5

Please sign in to comment.