diff --git a/x/wasm/keeper/relay_test.go b/x/wasm/keeper/relay_test.go index 04fc213e..f7d9af6b 100644 --- a/x/wasm/keeper/relay_test.go +++ b/x/wasm/keeper/relay_test.go @@ -552,9 +552,9 @@ func TestOnAckPacket(t *testing.T) { for name, spec := range specs { t.Run(name, func(t *testing.T) { - myAck := wasmvmtypes.IBCAcknowledgementWithPacket{Acknowledgement: wasmvmtypes.IBCAcknowledgement{Data: []byte("myAck")}} + myAck := wasmvmtypes.IBCPacketAckMsg{Acknowledgement: wasmvmtypes.IBCAcknowledgement{Data: []byte("myAck")}} m.IBCPacketAckFn = func(codeID wasmvm.Checksum, env wasmvmtypes.Env, msg wasmvmtypes.IBCPacketAckMsg, store wasmvm.KVStore, goapi wasmvm.GoAPI, querier wasmvm.Querier, gasMeter wasmvm.GasMeter, gasLimit uint64, deserCost wasmvmtypes.UFraction) (*wasmvmtypes.IBCBasicResponse, uint64, error) { - assert.Equal(t, myAck, msg.Ack) + assert.Equal(t, myAck, msg) return spec.contractResp, myContractGas * DefaultGasMultiplier, spec.contractErr } diff --git a/x/wasm/relay_pingpong_test.go b/x/wasm/relay_pingpong_test.go index 1d69012d..d0e4f553 100644 --- a/x/wasm/relay_pingpong_test.go +++ b/x/wasm/relay_pingpong_test.go @@ -282,14 +282,13 @@ func (p player) IBCPacketReceive(codeID wasmvm.Checksum, env wasmvmtypes.Env, ms // OnIBCPacketAcknowledgement handles the packet acknowledgment frame. Stops the game on an any error func (p player) IBCPacketAck(codeID wasmvm.Checksum, env wasmvmtypes.Env, msg wasmvmtypes.IBCPacketAckMsg, store wasmvm.KVStore, goapi wasmvm.GoAPI, querier wasmvm.Querier, gasMeter wasmvm.GasMeter, gasLimit uint64, deserCost wasmvmtypes.UFraction) (*wasmvmtypes.IBCBasicResponse, uint64, error) { // parse received data and store - packetAck := msg.Ack var sentBall hit - if err := json.Unmarshal(packetAck.OriginalPacket.Data, &sentBall); err != nil { + if err := json.Unmarshal(msg.OriginalPacket.Data, &sentBall); err != nil { return nil, 0, err } var ack hitAcknowledgement - if err := json.Unmarshal(packetAck.Acknowledgement.Data, &ack); err != nil { + if err := json.Unmarshal(msg.Acknowledgement.Data, &ack); err != nil { return nil, 0, err } if ack.Success != nil { diff --git a/x/wasm/relay_test.go b/x/wasm/relay_test.go index 3a6a0c86..e08c78da 100644 --- a/x/wasm/relay_test.go +++ b/x/wasm/relay_test.go @@ -434,22 +434,21 @@ func (c *receiverContract) IBCPacketReceive(codeID wasmvm.Checksum, env wasmvmty } func (c *receiverContract) IBCPacketAck(codeID wasmvm.Checksum, env wasmvmtypes.Env, msg wasmvmtypes.IBCPacketAckMsg, store wasmvm.KVStore, goapi wasmvm.GoAPI, querier wasmvm.Querier, gasMeter wasmvm.GasMeter, gasLimit uint64, deserCost wasmvmtypes.UFraction) (*wasmvmtypes.IBCBasicResponse, uint64, error) { - packetAck := msg.Ack var data ibctransfertypes.FungibleTokenPacketData - if err := ibctransfertypes.ModuleCdc.UnmarshalJSON(packetAck.OriginalPacket.Data, &data); err != nil { + if err := ibctransfertypes.ModuleCdc.UnmarshalJSON(msg.OriginalPacket.Data, &data); err != nil { return nil, 0, err } // call original ibctransfer keeper to not copy all code into this var ack channeltypes.Acknowledgement - if err := ibctransfertypes.ModuleCdc.UnmarshalJSON(packetAck.Acknowledgement.Data, &ack); err != nil { + if err := ibctransfertypes.ModuleCdc.UnmarshalJSON(msg.Acknowledgement.Data, &ack); err != nil { return nil, 0, err } // call original ibctransfer keeper to not copy all code into this ctx := c.chain.GetContext() // HACK: please note that this is not reverted after checkTX - ibcPacket := toIBCPacket(packetAck.OriginalPacket) + ibcPacket := toIBCPacket(msg.OriginalPacket) err := c.chain.TestSupport().TransferKeeper().OnAcknowledgementPacket(ctx, ibcPacket, data, ack) if err != nil { return nil, 0, sdkerrors.Wrap(err, "within our smart contract")