refactor: Use mocks for x/mint testing

scripts/mockgen.sh

@@ -11,4 +11,5 @@ $mockgen_cmd -package mocks -destination tests/mocks/grpc_server.go github.com/g
 $mockgen_cmd -package mocks -destination tests/mocks/tendermint_tendermint_libs_log_DB.go github.com/tendermint/tendermint/libs/log Logger
 $mockgen_cmd -source=orm/model/ormtable/hooks.go -package ormmocks -destination orm/testing/ormmocks/hooks.go
 $mockgen_cmd -source=x/nft/expected_keepers.go -package testutil -destination x/nft/testutil/expected_keepers_mocks.go
-$mockgen_cmd -source=x/params/proposal_handler_test.go -package testutil -destination x/params/testutil/staking_keeper_mock.go
+$mockgen_cmd -source=x/mint/types/expected_keepers.go -package testutil -destination x/mint/testutil/expected_keepers_mocks.go
+$mockgen_cmd -source=x/params/proposal_handler_test.go -package testutil -destination x/params/testutil/staking_keeper_mock.go

x/mint/keeper/grpc_query_test.go

@@ -4,15 +4,18 @@ import (
 	gocontext "context"
 	"testing"
 
+	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/mint/keeper"
-	"github.com/cosmos/cosmos-sdk/x/mint/testutil"
+	minttestutil "github.com/cosmos/cosmos-sdk/x/mint/testutil"
 	"github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
@@ -25,20 +28,36 @@ type MintTestSuite struct {
 }
 
 func (suite *MintTestSuite) SetupTest() {
-	var interfaceRegistry codectypes.InterfaceRegistry
+	encCfg := moduletestutil.MakeTestEncodingConfig(mint.AppModuleBasic{})
+	key := sdk.NewKVStoreKey(types.StoreKey)
+	testCtx := testutil.DefaultContextWithDB(suite.T(), key, sdk.NewTransientStoreKey("transient_test"))
+	suite.ctx = testCtx.Ctx
 
-	app, err := simtestutil.Setup(testutil.AppConfig,
-		&interfaceRegistry,
-		&suite.mintKeeper,
+	// gomock initializations
+	ctrl := gomock.NewController(suite.T())
+	accountKeeper := minttestutil.NewMockAccountKeeper(ctrl)
+	bankKeeper := minttestutil.NewMockBankKeeper(ctrl)
+	stakingKeeper := minttestutil.NewMockStakingKeeper(ctrl)
+
+	accountKeeper.EXPECT().GetModuleAddress("mint").Return(sdk.AccAddress{})
+
+	suite.mintKeeper = keeper.NewKeeper(
+		encCfg.Codec,
+		key,
+		stakingKeeper,
+		accountKeeper,
+		bankKeeper,
+		authtypes.FeeCollectorName,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-	suite.Require().NoError(err)
 
-	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
+	err := suite.mintKeeper.SetParams(suite.ctx, types.DefaultParams())
+	suite.Require().NoError(err)
+	suite.mintKeeper.SetMinter(suite.ctx, types.DefaultInitialMinter())
 
-	queryHelper := baseapp.NewQueryServerTestHelper(ctx, interfaceRegistry)
+	queryHelper := baseapp.NewQueryServerTestHelper(testCtx.Ctx, encCfg.InterfaceRegistry)
 	types.RegisterQueryServer(queryHelper, suite.mintKeeper)
 
-	suite.ctx = ctx
 	suite.queryClient = types.NewQueryClient(queryHelper)
 }
 

x/mint/keeper/keeper_test.go

@@ -2,36 +2,62 @@ package keeper_test
 
 import (
 	"testing"
-	"time"
 
+	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/mint/keeper"
+	minttestutil "github.com/cosmos/cosmos-sdk/x/mint/testutil"
 	"github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
 type IntegrationTestSuite struct {
 	suite.Suite
 
-	app       *simapp.SimApp
-	ctx       sdk.Context
-	msgServer types.MsgServer
+	mintKeeper keeper.Keeper
+	ctx        sdk.Context
+	msgServer  types.MsgServer
 }
 
 func TestKeeperTestSuite(t *testing.T) {
 	suite.Run(t, new(IntegrationTestSuite))
 }
 
 func (s *IntegrationTestSuite) SetupTest() {
-	app := simapp.Setup(s.T(), false)
-	ctx := app.BaseApp.NewContext(false, tmproto.Header{Time: time.Now()})
+	encCfg := moduletestutil.MakeTestEncodingConfig(mint.AppModuleBasic{})
+	key := sdk.NewKVStoreKey(types.StoreKey)
+	testCtx := testutil.DefaultContextWithDB(s.T(), key, sdk.NewTransientStoreKey("transient_test"))
+	s.ctx = testCtx.Ctx
 
-	s.app = app
-	s.ctx = ctx
-	s.msgServer = keeper.NewMsgServerImpl(s.app.MintKeeper)
+	// gomock initializations
+	ctrl := gomock.NewController(s.T())
+	accountKeeper := minttestutil.NewMockAccountKeeper(ctrl)
+	bankKeeper := minttestutil.NewMockBankKeeper(ctrl)
+	stakingKeeper := minttestutil.NewMockStakingKeeper(ctrl)
+
+	accountKeeper.EXPECT().GetModuleAddress(types.ModuleName).Return(sdk.AccAddress{})
+
+	s.mintKeeper = keeper.NewKeeper(
+		encCfg.Codec,
+		key,
+		stakingKeeper,
+		accountKeeper,
+		bankKeeper,
+		authtypes.FeeCollectorName,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
+	err := s.mintKeeper.SetParams(s.ctx, types.DefaultParams())
+	s.Require().NoError(err)
+	s.mintKeeper.SetMinter(s.ctx, types.DefaultInitialMinter())
+
+	s.msgServer = keeper.NewMsgServerImpl(s.mintKeeper)
 }
 
 func (s *IntegrationTestSuite) TestParams() {
@@ -70,16 +96,16 @@ func (s *IntegrationTestSuite) TestParams() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			expected := s.app.MintKeeper.GetParams(s.ctx)
-			err := s.app.MintKeeper.SetParams(s.ctx, tc.input)
+			expected := s.mintKeeper.GetParams(s.ctx)
+			err := s.mintKeeper.SetParams(s.ctx, tc.input)
 			if tc.expectErr {
 				s.Require().Error(err)
 			} else {
 				expected = tc.input
 				s.Require().NoError(err)
 			}
 
-			p := s.app.MintKeeper.GetParams(s.ctx)
+			p := s.mintKeeper.GetParams(s.ctx)
 			s.Require().Equal(expected, p)
 		})
 	}

x/mint/keeper/msg_server_test.go

@@ -21,7 +21,7 @@ func (s *IntegrationTestSuite) TestUpdateParams() {
 		{
 			name: "set invalid params",
 			request: &types.MsgUpdateParams{
-				Authority: s.app.MintKeeper.GetAuthority(),
+				Authority: s.mintKeeper.GetAuthority(),
 				Params: types.Params{
 					MintDenom:           sdk.DefaultBondDenom,
 					InflationRateChange: sdk.NewDecWithPrec(-13, 2),
@@ -36,7 +36,7 @@ func (s *IntegrationTestSuite) TestUpdateParams() {
 		{
 			name: "set full valid params",
 			request: &types.MsgUpdateParams{
-				Authority: s.app.MintKeeper.GetAuthority(),
+				Authority: s.mintKeeper.GetAuthority(),
 				Params: types.Params{
 					MintDenom:           sdk.DefaultBondDenom,
 					InflationRateChange: sdk.NewDecWithPrec(8, 2),

x/mint/keeper/querier_test.go

@@ -3,17 +3,21 @@ package keeper_test
 import (
 	"testing"
 
+	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/mint/keeper"
 	keep "github.com/cosmos/cosmos-sdk/x/mint/keeper"
-	"github.com/cosmos/cosmos-sdk/x/mint/testutil"
+	minttestutil "github.com/cosmos/cosmos-sdk/x/mint/testutil"
 	"github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
@@ -26,15 +30,31 @@ type MintKeeperTestSuite struct {
 }
 
 func (suite *MintKeeperTestSuite) SetupTest() {
-	app, err := simtestutil.Setup(testutil.AppConfig,
-		&suite.legacyAmino,
-		&suite.mintKeeper,
+	encCfg := moduletestutil.MakeTestEncodingConfig(mint.AppModuleBasic{})
+	key := sdk.NewKVStoreKey(types.StoreKey)
+	testCtx := testutil.DefaultContextWithDB(suite.T(), key, sdk.NewTransientStoreKey("transient_test"))
+	suite.ctx = testCtx.Ctx
+
+	// gomock initializations
+	ctrl := gomock.NewController(suite.T())
+	accountKeeper := minttestutil.NewMockAccountKeeper(ctrl)
+	bankKeeper := minttestutil.NewMockBankKeeper(ctrl)
+	stakingKeeper := minttestutil.NewMockStakingKeeper(ctrl)
+
+	accountKeeper.EXPECT().GetModuleAddress(types.ModuleName).Return(sdk.AccAddress{})
+
+	suite.mintKeeper = keeper.NewKeeper(
+		encCfg.Codec,
+		key,
+		stakingKeeper,
+		accountKeeper,
+		bankKeeper,
+		authtypes.FeeCollectorName,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-	suite.Require().NoError(err)
-
-	suite.ctx = app.BaseApp.NewContext(true, tmproto.Header{})
 
-	suite.mintKeeper.SetParams(suite.ctx, types.DefaultParams())
+	err := suite.mintKeeper.SetParams(suite.ctx, types.DefaultParams())
+	suite.Require().NoError(err)
 	suite.mintKeeper.SetMinter(suite.ctx, types.DefaultInitialMinter())
 }
 

x/mint/simulation/decoder_test.go

@@ -6,27 +6,24 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/depinject"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/kv"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/mint/simulation"
-	"github.com/cosmos/cosmos-sdk/x/mint/testutil"
 	"github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
 func TestDecodeStore(t *testing.T) {
-	var cdc codec.Codec
-	err := depinject.Inject(testutil.AppConfig, &cdc)
-	require.NoError(t, err)
+	encCfg := moduletestutil.MakeTestEncodingConfig(mint.AppModuleBasic{})
 
-	dec := simulation.NewDecodeStore(cdc)
+	dec := simulation.NewDecodeStore(encCfg.Codec)
 
 	minter := types.NewMinter(sdk.OneDec(), sdk.NewDec(15))
 
 	kvPairs := kv.Pairs{
 		Pairs: []kv.Pair{
-			{Key: types.MinterKey, Value: cdc.MustMarshal(&minter)},
+			{Key: types.MinterKey, Value: encCfg.Codec.MustMarshal(&minter)},
 			{Key: []byte{0x99}, Value: []byte{0x99}},
 		},
 	}

x/mint/simulation/genesis_test.go

@@ -8,27 +8,26 @@ import (
 	"github.com/stretchr/testify/require"
 
 	sdkmath "cosmossdk.io/math"
-	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/mint/simulation"
 	"github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
 // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState.
 // Abonormal scenarios are not tested here.
 func TestRandomizedGenState(t *testing.T) {
-	interfaceRegistry := codectypes.NewInterfaceRegistry()
-	cdc := codec.NewProtoCodec(interfaceRegistry)
+	encCfg := moduletestutil.MakeTestEncodingConfig(mint.AppModuleBasic{})
 
 	s := rand.NewSource(1)
 	r := rand.New(s)
 
 	simState := module.SimulationState{
 		AppParams:    make(simtypes.AppParams),
-		Cdc:          cdc,
+		Cdc:          encCfg.Codec,
 		Rand:         r,
 		NumBonded:    3,
 		Accounts:     simtypes.RandomAccounts(r, 3),
@@ -59,8 +58,7 @@ func TestRandomizedGenState(t *testing.T) {
 
 // TestRandomizedGenState tests abnormal scenarios of applying RandomizedGenState.
 func TestRandomizedGenState1(t *testing.T) {
-	interfaceRegistry := codectypes.NewInterfaceRegistry()
-	cdc := codec.NewProtoCodec(interfaceRegistry)
+	encCfg := moduletestutil.MakeTestEncodingConfig(mint.AppModuleBasic{})
 
 	s := rand.NewSource(1)
 	r := rand.New(s)
@@ -74,7 +72,7 @@ func TestRandomizedGenState1(t *testing.T) {
 		{ // panic => reason: incomplete initialization of the simState
 			module.SimulationState{
 				AppParams: make(simtypes.AppParams),
-				Cdc:       cdc,
+				Cdc:       encCfg.Codec,
 				Rand:      r,
 			}, "assignment to entry in nil map"},
 	}