Update test code

x/wasm/alias.go

@@ -46,7 +46,8 @@ var (
 	NewContractInfo           = types.NewContractInfo
 	NewEnv                    = types.NewEnv
 	NewWasmCoins              = types.NewWasmCoins
-	CosmosResult              = types.CosmosResult
+	ParseEvents               = types.ParseEvents
+	ResultFromData            = types.ResultFromData
 	DefaultWasmConfig         = types.DefaultWasmConfig
 	InitGenesis               = keeper.InitGenesis
 	ExportGenesis             = keeper.ExportGenesis

x/wasm/handler.go

@@ -125,7 +125,7 @@ func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) (*sdk.Res
 	)
 
 	res.Events = append(events, ourEvent)
-	return &res, nil
+	return res, nil
 }
 
 func handleMigration(ctx sdk.Context, k Keeper, msg *MsgMigrateContract) (*sdk.Result, error) {

x/wasm/internal/keeper/keeper.go

@@ -238,11 +238,6 @@ func (k Keeper) Migrate(ctx sdk.Context, contractAddress sdk.AccAddress, caller
 	events := types.ParseEvents(res.Log, contractAddress)
 	ctx.EventManager().EmitEvents(events)
 
-	err = k.dispatchMessages(ctx, contractAddress, res.Messages)
-	if err != nil {
-		return nil, err
-	}
-
 	contractInfo.UpdateCodeID(ctx, newCodeID)
 	k.setContractInfo(ctx, contractAddress, contractInfo)