[autofix.ci] apply automated fixes

Author: autofix-ci[bot]

tests/e2e/ibc2_test.go

@@ -7,7 +7,6 @@ import (
 
 	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
 	channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types"
-
 	ibctesting "github.com/cosmos/ibc-go/v10/testing"
 	mockv2 "github.com/cosmos/ibc-go/v10/testing/mock/v2"
 	"github.com/stretchr/testify/require"

tests/wasmibctesting/utils.go

@@ -66,8 +66,6 @@ func NewWasmTestChain(chain *ibctesting.TestChain) *WasmTestChain {
 	return &res
 }
 
-// TODO: jawoznia
-// Waiting for ParsePacketsFromEventsV2 being implemented by ibcv2 team
 func (chain *WasmTestChain) CaptureIBCEventsV2(result *abci.ExecTxResult) {
 	toSend, err := ParsePacketsFromEventsV2(channeltypesv2.EventTypeSendPacket, result.Events)
 	require.NoError(chain, err)
@@ -77,6 +75,9 @@ func (chain *WasmTestChain) CaptureIBCEventsV2(result *abci.ExecTxResult) {
 	}
 }
 
+// TODO: Remove this once it's implemented in the `ibc-go`.
+// https://github.com/cosmos/ibc-go/issues/8284
+//
 // ParsePacketsFromEventsV2 parses events emitted from a MsgRecvPacket and returns
 // all the packets found.
 // Returns an error if no packet is found.
@@ -94,7 +95,6 @@ func ParsePacketsFromEventsV2(eventType string, events []abci.Event) ([]channelt
 					if err != nil {
 						return ferr(err)
 					}
-					// packet, err := DeserializePacketV2(data)
 					var packet channeltypesv2.Packet
 					err = proto.Unmarshal(data, &packet)
 					if err != nil {
@@ -106,12 +106,8 @@ func ParsePacketsFromEventsV2(eventType string, events []abci.Event) ([]channelt
 					continue
 				}
 			}
-
 		}
 	}
-	// if len(packets) == 0 {
-	// 	return ferr(errors.New("acknowledgement event attribute not found"))
-	// }
 	return packets, nil
 }
 
@@ -140,9 +136,6 @@ func (chain *WasmTestChain) OverrideSendMsgs(msgs ...sdk.Msg) (*abci.ExecTxResul
 	result, err := chain.TestChain.SendMsgs(msgs...)
 	chain.SendMsgsOverride = chain.OverrideSendMsgs
 	chain.CaptureIBCEvents(result)
-	// TODO: jawoznia
-	// Waiting for ParsePacketsFromEventsV2 being implemented by ibcv2 team
-	//
 	chain.CaptureIBCEventsV2(result)
 	return result, err
 }

x/wasm/keeper/handler_plugin.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
+	channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -14,8 +15,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types"
-
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
@@ -276,7 +275,8 @@ func NewIBC2RawPacketHandler(channelKeeperV2 types.ChannelKeeperV2) IBC2RawPacke
 
 // DispatchMsg publishes a raw IBC2 packet onto the channel.
 func (h IBC2RawPacketHandler) DispatchMsg(ctx sdk.Context,
-	contractAddr sdk.AccAddress, contractIBC2PortID string, msg wasmvmtypes.CosmosMsg) ([]sdk.Event, [][]byte, [][]*codectypes.Any, error) {
+	contractAddr sdk.AccAddress, contractIBC2PortID string, msg wasmvmtypes.CosmosMsg,
+) ([]sdk.Event, [][]byte, [][]*codectypes.Any, error) {
 	if msg.IBC2 == nil {
 		return nil, nil, nil, types.ErrUnknownMsg
 	}