feat: decouple x/group from simapp (#12277)

cosmos · Jun 17, 2022 · 5d3fd85 · 5d3fd85
1 parent 7623603
commit 5d3fd85
Show file tree

Hide file tree

Showing 13 changed files with 496 additions and 378 deletions.
diff --git a/x/group/keeper/genesis_test.go b/x/group/keeper/genesis_test.go
@@ -7,28 +7,30 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
-	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/runtime"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/group"
 	"github.com/cosmos/cosmos-sdk/x/group/keeper"
+	"github.com/cosmos/cosmos-sdk/x/group/testutil"
 )
 
 type GenesisTestSuite struct {
 	suite.Suite
 
-	app    *simapp.SimApp
-	ctx    context.Context
-	sdkCtx sdk.Context
-	keeper keeper.Keeper
-	cdc    *codec.ProtoCodec
+	app               *runtime.App
+	ctx               context.Context
+	sdkCtx            sdk.Context
+	keeper            keeper.Keeper
+	cdc               *codec.ProtoCodec
+	interfaceRegistry codectypes.InterfaceRegistry
 }
 
 func TestGenesisTestSuite(t *testing.T) {
@@ -43,15 +45,16 @@ var (
 )
 
 func (s *GenesisTestSuite) SetupSuite() {
-	checkTx := false
-	db := dbm.NewMemDB()
-	encCdc := simapp.MakeTestEncodingConfig()
-	app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encCdc, simapp.EmptyAppOptions{})
+	app, err := simtestutil.SetupAtGenesis(
+		testutil.AppConfig,
+		&s.interfaceRegistry,
+		&s.keeper,
+	)
+	s.Require().NoError(err)
 
 	s.app = app
-	s.sdkCtx = app.BaseApp.NewUncachedContext(checkTx, tmproto.Header{})
-	s.keeper = app.GroupKeeper
-	s.cdc = codec.NewProtoCodec(app.InterfaceRegistry())
+	s.sdkCtx = app.BaseApp.NewUncachedContext(false, tmproto.Header{})
+	s.cdc = codec.NewProtoCodec(s.interfaceRegistry)
 	s.ctx = sdk.WrapSDKContext(s.sdkCtx)
 }
 

diff --git a/x/group/keeper/grpc_query_test.go b/x/group/keeper/grpc_query_test.go
@@ -5,28 +5,48 @@ import (
 	"testing"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/simapp"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	"github.com/cosmos/cosmos-sdk/x/group"
+	groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
+	"github.com/cosmos/cosmos-sdk/x/group/testutil"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	"github.com/stretchr/testify/require"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 )
 
 func TestQueryGroupsByMember(t *testing.T) {
-	app := simapp.Setup(t, false)
+	var (
+		bankKeeper        bankkeeper.Keeper
+		groupKeeper       groupkeeper.Keeper
+		stakingKeeper     *stakingkeeper.Keeper
+		interfaceRegistry codectypes.InterfaceRegistry
+	)
+	app, err := simtestutil.Setup(
+		testutil.AppConfig,
+		&interfaceRegistry,
+		&bankKeeper,
+		&groupKeeper,
+		&stakingKeeper,
+	)
+	require.NoError(t, err)
+
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
-	queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry())
-	group.RegisterQueryServer(queryHelper, app.GroupKeeper)
+	queryHelper := baseapp.NewQueryServerTestHelper(ctx, interfaceRegistry)
+	group.RegisterQueryServer(queryHelper, groupKeeper)
 	queryClient := group.NewQueryClient(queryHelper)
 	sdkCtx := sdk.WrapSDKContext(ctx)
 
-	addrs := simapp.AddTestAddrsIncremental(app, ctx, 6, sdk.NewInt(30000000))
+	addrs := simtestutil.AddTestAddrsIncremental(bankKeeper, stakingKeeper, ctx, 6, sdk.NewInt(30000000))
 
 	// Initial group, group policy and balance setup
 	members := []group.MemberRequest{
 		{Address: addrs[2].String(), Weight: "1"}, {Address: addrs[3].String(), Weight: "2"},
 	}
-	_, err := app.GroupKeeper.CreateGroup(sdkCtx, &group.MsgCreateGroup{
+
+	_, err = groupKeeper.CreateGroup(sdkCtx, &group.MsgCreateGroup{
 		Admin:   addrs[0].String(),
 		Members: members,
 	})
@@ -35,7 +55,7 @@ func TestQueryGroupsByMember(t *testing.T) {
 	members = []group.MemberRequest{
 		{Address: addrs[3].String(), Weight: "1"}, {Address: addrs[4].String(), Weight: "2"},
 	}
-	_, err = app.GroupKeeper.CreateGroup(sdkCtx, &group.MsgCreateGroup{
+	_, err = groupKeeper.CreateGroup(sdkCtx, &group.MsgCreateGroup{
 		Admin:   addrs[1].String(),
 		Members: members,
 	})