move tests to integration folder

x/wasm/genesis_test.go → tests/integration/genesis_test.go

@@ -1,4 +1,4 @@
-package wasm
+package integration
 
 import (
 	"encoding/json"

x/wasm/ibc_integration_test.go → tests/integration/ibc_integration_test.go

@@ -1,4 +1,4 @@
-package wasm_test
+package integration
 
 import (
 	"encoding/base64"

x/wasm/keeper/migrations_integration_test.go → tests/integration/migrations_integration_test.go

@@ -1,4 +1,4 @@
-package keeper_test
+package integration
 
 import (
 	"testing"

x/wasm/module_test.go → tests/integration/module_test.go

@@ -1,4 +1,4 @@
-package wasm
+package integration
 
 import (
 	"bytes"
@@ -24,6 +24,7 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
 	"github.com/CosmWasm/wasmd/app/params"
+	"github.com/CosmWasm/wasmd/x/wasm"
 	"github.com/CosmWasm/wasmd/x/wasm/exported"
 	"github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
@@ -44,7 +45,7 @@ func (ms mockSubspace) GetParamSet(ctx sdk.Context, ps exported.ParamSet) {
 }
 
 type testData struct {
-	module           AppModule
+	module           wasm.AppModule
 	ctx              sdk.Context
 	acctKeeper       authkeeper.AccountKeeper
 	keeper           keeper.Keeper
@@ -73,7 +74,7 @@ func setupTest(t *testing.T) testData {
 	queryRouter.SetInterfaceRegistry(encConf.InterfaceRegistry)
 	serviceRouter.SetInterfaceRegistry(encConf.InterfaceRegistry)
 	data := testData{
-		module:           NewAppModule(encConf.Codec, keepers.WasmKeeper, keepers.StakingKeeper, keepers.AccountKeeper, keepers.BankKeeper, nil, newMockSubspace(DefaultParams)),
+		module:           wasm.NewAppModule(encConf.Codec, keepers.WasmKeeper, keepers.StakingKeeper, keepers.AccountKeeper, keepers.BankKeeper, nil, newMockSubspace(DefaultParams)),
 		ctx:              ctx,
 		acctKeeper:       keepers.AccountKeeper,
 		keeper:           *keepers.WasmKeeper,
@@ -511,7 +512,7 @@ func TestReadWasmConfig(t *testing.T) {
 	}
 	for msg, spec := range specs {
 		t.Run(msg, func(t *testing.T) {
-			got, err := ReadWasmConfig(spec.src)
+			got, err := wasm.ReadWasmConfig(spec.src)
 			require.NoError(t, err)
 			assert.Equal(t, spec.exp, got)
 		})

x/wasm/keeper/msg_server_integration_test.go → tests/integration/msg_server_integration_test.go

@@ -1,4 +1,4 @@
-package keeper_test
+package integration
 
 import (
 	_ "embed"
@@ -20,10 +20,10 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
-//go:embed testdata/reflect_1_5.wasm
+//go:embed ../../../x/wasm/keeper/testdata/reflect_1_5.wasm
 var wasmContract []byte
 
-//go:embed testdata/hackatom.wasm
+//go:embed ../../../x/wasm/keeper/testdata/hackatom.wasm
 var hackatomContract []byte
 
 func TestStoreCode(t *testing.T) {

x/wasm/keeper/proposal_integration_test.go → tests/integration/proposal_integration_test.go

@@ -1,4 +1,4 @@
-package keeper
+package integration
 
 import (
 	"encoding/hex"
@@ -18,27 +18,33 @@ import (
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
+var (
+	CyberpunkCapabilities = []string{"staking", "mask", "stargate", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4"}
+	ReflectCapabilities   = []string{"staking", "mask", "stargate", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0"}
+)
+
 func TestLoadStoredGovV1Beta1LegacyTypes(t *testing.T) {
 	capabilities := make([]string, len(ReflectCapabilities)+1)
 	copy(capabilities, ReflectCapabilities)
 	capabilities = append(capabilities, "iterator")
-	pCtx, keepers := CreateTestInput(t, false, capabilities)
+	pCtx, keepers := keeper.CreateTestInput(t, false, capabilities)
 	k := keepers.WasmKeeper
 	keepers.GovKeeper.SetLegacyRouter(v1beta1.NewRouter().
-		AddRoute(types.ModuleName, NewLegacyWasmProposalHandler(k, types.EnableAllProposals)),
+		AddRoute(types.ModuleName, keeper.NewLegacyWasmProposalHandler(k, types.EnableAllProposals)),
 	)
-	myAddress := RandomAccountAddress(t)
+	myAddress := keeper.RandomAccountAddress(t)
 	keepers.Faucet.Fund(pCtx, myAddress, sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewIntFromUint64(100_000_000)))
 	keepers.Faucet.Fund(pCtx, myAddress, sdk.NewCoin("denom", sdkmath.NewIntFromUint64(100_000_000)))
 
-	reflectExample := InstantiateReflectExampleContract(t, pCtx, keepers)
-	burnerCodeID, _, err := k.create(pCtx, myAddress, testdata.BurnerContractWasm(), nil, DefaultAuthorizationPolicy{})
+	reflectExample := keeper.InstantiateReflectExampleContract(t, pCtx, keepers)
+	burnerCodeID, _, err := k.create(pCtx, myAddress, testdata.BurnerContractWasm(), nil, keeper.DefaultAuthorizationPolicy{}) //TODO: what to do here
 	require.NoError(t, err)
-	hackatomExample := InstantiateHackatomExampleContract(t, pCtx, keepers)
+	hackatomExample := keeper.InstantiateHackatomExampleContract(t, pCtx, keepers)
 
 	type StealMsg struct {
 		Recipient string     `json:"recipient"`
@@ -193,7 +199,7 @@ func TestLoadStoredGovV1Beta1LegacyTypes(t *testing.T) {
 	}
 }
 
-func mustSubmitAndExecuteLegacyProposal(t *testing.T, ctx sdk.Context, content v1beta1.Content, myActorAddress string, keepers TestKeepers) uint64 {
+func mustSubmitAndExecuteLegacyProposal(t *testing.T, ctx sdk.Context, content v1beta1.Content, myActorAddress string, keepers keeper.TestKeepers) uint64 {
 	t.Helper()
 	govAuthority := keepers.AccountKeeper.GetModuleAddress(govtypes.ModuleName).String()
 	msgServer := govkeeper.NewMsgServerImpl(keepers.GovKeeper)