feat: decouple x/slashing from simapp

testutil/sims/address_helpers.go

@@ -7,6 +7,7 @@ import (
 
 	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
@@ -15,6 +16,15 @@ import (
 
 type GenerateAccountStrategy func(int) []sdk.AccAddress
 
+// AddTestAddrsFromPubKeys adds the addresses into the SimApp providing only the public keys.
+func AddTestAddrsFromPubKeys(bankKeeper bankkeeper.Keeper, stakingKeeper *stakingkeeper.Keeper, ctx sdk.Context, pubKeys []cryptotypes.PubKey, accAmt math.Int) {
+	initCoins := sdk.NewCoins(sdk.NewCoin(stakingKeeper.BondDenom(ctx), accAmt))
+
+	for _, pk := range pubKeys {
+		initAccountWithCoins(bankKeeper, ctx, sdk.AccAddress(pk.Address()), initCoins)
+	}
+}
+
 // AddTestAddrsIncremental constructs and returns accNum amount of accounts with an initial balance of accAmt in random order
 func AddTestAddrsIncremental(bankKeeper bankkeeper.Keeper, stakingKeeper *stakingkeeper.Keeper, ctx sdk.Context, accNum int, accAmt math.Int) []sdk.AccAddress {
 	return addTestAddrs(bankKeeper, stakingKeeper, ctx, accNum, accAmt, CreateIncrementalAccounts)

x/slashing/keeper/grpc_query_test.go

@@ -2,76 +2,30 @@ package keeper_test
 
 import (
 	gocontext "context"
-	"testing"
-	"time"
 
-	"github.com/stretchr/testify/suite"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-
-	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/slashing/testslashing"
 	"github.com/cosmos/cosmos-sdk/x/slashing/types"
 )
 
-type SlashingTestSuite struct {
-	suite.Suite
-
-	app         *simapp.SimApp
-	ctx         sdk.Context
-	queryClient types.QueryClient
-	addrDels    []sdk.AccAddress
-}
-
-func (suite *SlashingTestSuite) SetupTest() {
-	app := simapp.Setup(suite.T(), false)
-	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
-
-	app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams())
-	app.BankKeeper.SetParams(ctx, banktypes.DefaultParams())
-	app.SlashingKeeper.SetParams(ctx, testslashing.TestParams())
-
-	addrDels := simapp.AddTestAddrsIncremental(app, ctx, 2, app.StakingKeeper.TokensFromConsensusPower(ctx, 200))
-
-	info1 := types.NewValidatorSigningInfo(sdk.ConsAddress(addrDels[0]), int64(4), int64(3),
-		time.Unix(2, 0), false, int64(10))
-	info2 := types.NewValidatorSigningInfo(sdk.ConsAddress(addrDels[1]), int64(5), int64(4),
-		time.Unix(2, 0), false, int64(10))
-
-	app.SlashingKeeper.SetValidatorSigningInfo(ctx, sdk.ConsAddress(addrDels[0]), info1)
-	app.SlashingKeeper.SetValidatorSigningInfo(ctx, sdk.ConsAddress(addrDels[1]), info2)
-
-	suite.app = app
-	suite.ctx = ctx
-	suite.addrDels = addrDels
-
-	queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry())
-	types.RegisterQueryServer(queryHelper, app.SlashingKeeper)
-	queryClient := types.NewQueryClient(queryHelper)
-	suite.queryClient = queryClient
-}
-
-func (suite *SlashingTestSuite) TestGRPCQueryParams() {
+func (suite *KeeperTestSuite) TestGRPCQueryParams() {
 	queryClient := suite.queryClient
 	paramsResp, err := queryClient.Params(gocontext.Background(), &types.QueryParamsRequest{})
 
 	suite.NoError(err)
 	suite.Equal(testslashing.TestParams(), paramsResp.Params)
 }
 
-func (suite *SlashingTestSuite) TestGRPCSigningInfo() {
+func (suite *KeeperTestSuite) TestGRPCSigningInfo() {
 	queryClient := suite.queryClient
 
 	infoResp, err := queryClient.SigningInfo(gocontext.Background(), &types.QuerySigningInfoRequest{ConsAddress: ""})
 	suite.Error(err)
 	suite.Nil(infoResp)
 
 	consAddr := sdk.ConsAddress(suite.addrDels[0])
-	info, found := suite.app.SlashingKeeper.GetValidatorSigningInfo(suite.ctx, consAddr)
+	info, found := suite.slashingKeeper.GetValidatorSigningInfo(suite.ctx, consAddr)
 	suite.True(found)
 
 	infoResp, err = queryClient.SigningInfo(gocontext.Background(),
@@ -80,12 +34,12 @@ func (suite *SlashingTestSuite) TestGRPCSigningInfo() {
 	suite.Equal(info, infoResp.ValSigningInfo)
 }
 
-func (suite *SlashingTestSuite) TestGRPCSigningInfos() {
+func (suite *KeeperTestSuite) TestGRPCSigningInfos() {
 	queryClient := suite.queryClient
 
 	var signingInfos []types.ValidatorSigningInfo
 
-	suite.app.SlashingKeeper.IterateValidatorSigningInfos(suite.ctx, func(consAddr sdk.ConsAddress, info types.ValidatorSigningInfo) (stop bool) {
+	suite.slashingKeeper.IterateValidatorSigningInfos(suite.ctx, func(consAddr sdk.ConsAddress, info types.ValidatorSigningInfo) (stop bool) {
 		signingInfos = append(signingInfos, info)
 		return false
 	})
@@ -104,7 +58,3 @@ func (suite *SlashingTestSuite) TestGRPCSigningInfos() {
 	suite.NotNil(infoResp.Pagination.NextKey)
 	suite.Equal(uint64(2), infoResp.Pagination.Total)
 }
-
-func TestSlashingTestSuite(t *testing.T) {
-	suite.Run(t, new(SlashingTestSuite))
-}