test(vtransfer): more comprehensive multiapp tests

golang/cosmos/types/address_hooks_test.go

@@ -211,6 +211,14 @@ func TestExtractBaseAddressFromPacket(t *testing.T) {
 					}
 
 					require.Equal(t, ftPacketData, packetData)
+
+					roundTripBz, err := cdc.MarshalJSON(&packetData)
+					require.NoError(t, err)
+					require.Equal(t, packet.GetData(), roundTripBz)
+
+					roundTripPacket := packet
+					roundTripPacket.Data = roundTripBz
+					require.Equal(t, packet, roundTripPacket)
 				})
 			}
 		})

golang/cosmos/x/swingset/testing/queue.go

@@ -15,3 +15,11 @@ func GetActionQueueRecords(t *testing.T, ctx sdk.Context, swingsetKeeper keeper.
 	actionQueueName := keeper.StoragePathActionQueue
 	return vstoragetesting.GetQueueItems(ctx, vstorageKeeper, actionQueueName)
 }
+
+// ResetActionQueue resets the action queue.
+// This is a testing utility function.
+func ResetActionQueue(t *testing.T, ctx sdk.Context, swingsetKeeper keeper.Keeper) error {
+	vstorageKeeper := keeper.GetVstorageKeeper(t, swingsetKeeper)
+	actionQueueName := keeper.StoragePathActionQueue
+	return vstoragetesting.ResetQueue(ctx, vstorageKeeper, actionQueueName)
+}

golang/cosmos/x/vibc/types/receiver.go

@@ -38,7 +38,7 @@ func NewReceiver(impl ReceiverImpl) Receiver {
 	}
 }
 
-type portMessage struct { // comes from swingset's IBC handler
+type PortMessage struct { // comes from swingset's IBC handler
 	Type              string              `json:"type"` // IBC_METHOD
 	Method            string              `json:"method"`
 	Packet            channeltypes.Packet `json:"packet"`
@@ -94,7 +94,7 @@ func (ir Receiver) Receive(cctx context.Context, jsonRequest string) (jsonReply
 	ctx := sdk.UnwrapSDKContext(cctx)
 	impl := ir.impl
 
-	msg := new(portMessage)
+	msg := new(PortMessage)
 	err = json.Unmarshal([]byte(jsonRequest), &msg)
 	if err != nil {
 		return "", err

golang/cosmos/x/vstorage/testing/queue.go

@@ -26,3 +26,9 @@ func GetQueueItems(ctx sdk.Context, vstorageKeeper keeper.Keeper, queuePath stri
 	}
 	return values, nil
 }
+
+func ResetQueue(ctx sdk.Context, vstorageKeeper keeper.Keeper, queuePath string) error {
+	unlimitedCtx := ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
+	vstorageKeeper.RemoveEntriesWithPrefix(unlimitedCtx, queuePath)
+	return nil
+}

golang/cosmos/x/vtransfer/ibc_middleware.go

@@ -160,7 +160,11 @@ func (im IBCMiddleware) WriteAcknowledgement(
 	packet exported.PacketI,
 	ack exported.Acknowledgement,
 ) error {
-	return im.vtransferKeeper.InterceptWriteAcknowledgement(ctx, chanCap, packet, ack)
+	syncAck := im.vtransferKeeper.InterceptWriteAcknowledgement(ctx, chanCap, packet, ack)
+	if syncAck != nil {
+		return im.vtransferKeeper.WriteAcknowledgement(ctx, chanCap, packet, syncAck)
+	}
+	return nil
 }
 
 ///////////////////////////////////