remove PrivilegedKeeper

cosmos · cwgoes · Jun 30, 2018 · May 17, 2018 · May 18, 2018 · May 18, 2018
commit 8860fa301c439503111054dec09e792c2bf13818
diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go
@@ -47,7 +47,7 @@ type GaiaApp struct {
 	feeCollectionKeeper auth.FeeCollectionKeeper
 	coinKeeper          bank.Keeper
 	ibcMapper           ibc.Mapper
-	stakeKeeper         stake.PrivilegedKeeper
+	stakeKeeper         stake.Keeper
 	slashingKeeper      slashing.Keeper
 }
 
@@ -75,7 +75,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB) *GaiaApp {
 	// add handlers
 	app.coinKeeper = bank.NewKeeper(app.accountMapper)
 	app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
-	app.stakeKeeper = stake.NewPrivilegedKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
+	app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
 	app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.RegisterCodespace(slashing.DefaultCodespace))
 
 	// register message routes

diff --git a/cmd/gaia/cmd/gaiadebug/hack.go b/cmd/gaia/cmd/gaiadebug/hack.go
@@ -136,7 +136,7 @@ type GaiaApp struct {
 	feeCollectionKeeper auth.FeeCollectionKeeper
 	coinKeeper          bank.Keeper
 	ibcMapper           ibc.Mapper
-	stakeKeeper         stake.PrivilegedKeeper
+	stakeKeeper         stake.Keeper
 	slashingKeeper      slashing.Keeper
 }
 
@@ -164,7 +164,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB) *GaiaApp {
 	// add handlers
 	app.coinKeeper = bank.NewKeeper(app.accountMapper)
 	app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
-	app.stakeKeeper = stake.NewPrivilegedKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
+	app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
 	app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.RegisterCodespace(slashing.DefaultCodespace))
 
 	// register message routes

diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
@@ -42,7 +42,7 @@ type BasecoinApp struct {
 	feeCollectionKeeper auth.FeeCollectionKeeper
 	coinKeeper          bank.Keeper
 	ibcMapper           ibc.Mapper
-	stakeKeeper         stake.PrivilegedKeeper
+	stakeKeeper         stake.Keeper
 	slashingKeeper      slashing.Keeper
 }
 
@@ -72,7 +72,7 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB) *BasecoinApp {
 	// add accountMapper/handlers
 	app.coinKeeper = bank.NewKeeper(app.accountMapper)
 	app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
-	app.stakeKeeper = stake.NewPrivilegedKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
+	app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
 	app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.RegisterCodespace(slashing.DefaultCodespace))
 
 	// register message routes

diff --git a/server/tm_cmds.go b/server/tm_cmds.go
@@ -72,7 +72,7 @@ func UnsafeResetAllCmd(ctx *Context) *cobra.Command {
 		Short: "Reset blockchain database, priv_validator.json file, and the logger",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg := ctx.Config
-			tcmd.ResetAll(cfg.DBDir(), cfg.PrivValidatorFile(), ctx.Logger)
+			tcmd.ResetAll(cfg.DBDir(), cfg.P2P.AddrBookFile(), cfg.PrivValidatorFile(), ctx.Logger)
 			return nil
 		},
 	}

diff --git a/x/slashing/app_test.go b/x/slashing/app_test.go
@@ -22,14 +22,14 @@ var (
 )
 
 // initialize the mock application for this module
-func getMockApp(t *testing.T) (*mock.App, stake.PrivilegedKeeper, Keeper) {
+func getMockApp(t *testing.T) (*mock.App, stake.Keeper, Keeper) {
 	mapp := mock.NewApp()
 
 	RegisterWire(mapp.Cdc)
 	keyStake := sdk.NewKVStoreKey("stake")
 	keySlashing := sdk.NewKVStoreKey("slashing")
 	coinKeeper := bank.NewKeeper(mapp.AccountMapper)
-	stakeKeeper := stake.NewPrivilegedKeeper(mapp.Cdc, keyStake, coinKeeper, mapp.RegisterCodespace(stake.DefaultCodespace))
+	stakeKeeper := stake.NewKeeper(mapp.Cdc, keyStake, coinKeeper, mapp.RegisterCodespace(stake.DefaultCodespace))
 	keeper := NewKeeper(mapp.Cdc, keySlashing, stakeKeeper, mapp.RegisterCodespace(DefaultCodespace))
 	mapp.Router().AddRoute("stake", stake.NewHandler(stakeKeeper))
 	mapp.Router().AddRoute("slashing", NewHandler(keeper))
@@ -42,7 +42,7 @@ func getMockApp(t *testing.T) (*mock.App, stake.PrivilegedKeeper, Keeper) {
 }
 
 // stake endblocker
-func getEndBlocker(keeper stake.PrivilegedKeeper) sdk.EndBlocker {
+func getEndBlocker(keeper stake.Keeper) sdk.EndBlocker {
 	return func(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 		validatorUpdates := stake.EndBlocker(ctx, keeper)
 		return abci.ResponseEndBlock{
@@ -52,15 +52,15 @@ func getEndBlocker(keeper stake.PrivilegedKeeper) sdk.EndBlocker {
 }
 
 // overwrite the mock init chainer
-func getInitChainer(mapp *mock.App, keeper stake.PrivilegedKeeper) sdk.InitChainer {
+func getInitChainer(mapp *mock.App, keeper stake.Keeper) sdk.InitChainer {
 	return func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
 		mapp.InitChainer(ctx, req)
 		keeper.InitGenesis(ctx, stake.DefaultGenesisState())
 		return abci.ResponseInitChain{}
 	}
 }
 
-func checkValidator(t *testing.T, mapp *mock.App, keeper stake.PrivilegedKeeper,
+func checkValidator(t *testing.T, mapp *mock.App, keeper stake.Keeper,
 	addr sdk.Address, expFound bool) stake.Validator {
 	ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
 	validator, found := keeper.GetValidator(ctxCheck, addr1)

diff --git a/x/slashing/test_common.go b/x/slashing/test_common.go
@@ -46,7 +46,7 @@ func createTestCodec() *wire.Codec {
 	return cdc
 }
 
-func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.PrivilegedKeeper, Keeper) {
+func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.Keeper, Keeper) {
 	keyAcc := sdk.NewKVStoreKey("acc")
 	keyStake := sdk.NewKVStoreKey("stake")
 	keySlashing := sdk.NewKVStoreKey("slashing")
@@ -61,7 +61,7 @@ func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.PrivilegedKe
 	cdc := createTestCodec()
 	accountMapper := auth.NewAccountMapper(cdc, keyAcc, &auth.BaseAccount{})
 	ck := bank.NewKeeper(accountMapper)
-	sk := stake.NewPrivilegedKeeper(cdc, keyStake, ck, stake.DefaultCodespace)
+	sk := stake.NewKeeper(cdc, keyStake, ck, stake.DefaultCodespace)
 	genesis := stake.DefaultGenesisState()
 	genesis.Pool.LooseUnbondedTokens = initCoins.MulRaw(int64(len(addrs))).Int64()
 	sk.InitGenesis(ctx, genesis)

diff --git a/x/stake/app_test.go b/x/stake/app_test.go
@@ -30,13 +30,13 @@ var (
 )
 
 // initialize the mock application for this module
-func getMockApp(t *testing.T) (*mock.App, PrivilegedKeeper) {
+func getMockApp(t *testing.T) (*mock.App, Keeper) {
 	mapp := mock.NewApp()
 
 	RegisterWire(mapp.Cdc)
 	keyStake := sdk.NewKVStoreKey("stake")
 	coinKeeper := bank.NewKeeper(mapp.AccountMapper)
-	keeper := NewPrivilegedKeeper(mapp.Cdc, keyStake, coinKeeper, mapp.RegisterCodespace(DefaultCodespace))
+	keeper := NewKeeper(mapp.Cdc, keyStake, coinKeeper, mapp.RegisterCodespace(DefaultCodespace))
 	mapp.Router().AddRoute("stake", NewHandler(keeper))
 
 	mapp.SetEndBlocker(getEndBlocker(keeper))
@@ -47,7 +47,7 @@ func getMockApp(t *testing.T) (*mock.App, PrivilegedKeeper) {
 }
 
 // stake endblocker
-func getEndBlocker(keeper PrivilegedKeeper) sdk.EndBlocker {
+func getEndBlocker(keeper Keeper) sdk.EndBlocker {
 	return func(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 		validatorUpdates := EndBlocker(ctx, keeper)
 		return abci.ResponseEndBlock{
@@ -57,7 +57,7 @@ func getEndBlocker(keeper PrivilegedKeeper) sdk.EndBlocker {
 }
 
 // overwrite the mock init chainer
-func getInitChainer(mapp *mock.App, keeper PrivilegedKeeper) sdk.InitChainer {
+func getInitChainer(mapp *mock.App, keeper Keeper) sdk.InitChainer {
 	return func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
 		mapp.InitChainer(ctx, req)
 		keeper.InitGenesis(ctx, DefaultGenesisState())
@@ -68,7 +68,7 @@ func getInitChainer(mapp *mock.App, keeper PrivilegedKeeper) sdk.InitChainer {
 
 //__________________________________________________________________________________________
 
-func checkValidator(t *testing.T, mapp *mock.App, keeper PrivilegedKeeper,
+func checkValidator(t *testing.T, mapp *mock.App, keeper Keeper,
 	addr sdk.Address, expFound bool) Validator {
 
 	ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
@@ -77,7 +77,7 @@ func checkValidator(t *testing.T, mapp *mock.App, keeper PrivilegedKeeper,
 	return validator
 }
 
-func checkDelegation(t *testing.T, mapp *mock.App, keeper PrivilegedKeeper, delegatorAddr,
+func checkDelegation(t *testing.T, mapp *mock.App, keeper Keeper, delegatorAddr,
 	validatorAddr sdk.Address, expFound bool, expShares sdk.Rat) {
 
 	ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})

diff --git a/x/stake/handler.go b/x/stake/handler.go
@@ -11,7 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/stake/types"
 )
 
-func NewHandler(k keeper.PrivilegedKeeper) sdk.Handler {
+func NewHandler(k keeper.Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
 		// NOTE msg already has validate basic run
 		switch msg := msg.(type) {
@@ -36,7 +36,7 @@ func NewHandler(k keeper.PrivilegedKeeper) sdk.Handler {
 }
 
 // Called every block, process inflation, update validator set
-func EndBlocker(ctx sdk.Context, k keeper.PrivilegedKeeper) (ValidatorUpdates []abci.Validator) {
+func EndBlocker(ctx sdk.Context, k keeper.Keeper) (ValidatorUpdates []abci.Validator) {
 	pool := k.GetPool(ctx)
 
 	// Process types.Validator Provisions
@@ -63,7 +63,7 @@ func EndBlocker(ctx sdk.Context, k keeper.PrivilegedKeeper) (ValidatorUpdates []
 // These functions assume everything has been authenticated,
 // now we just perform action and save
 
-func handleMsgCreateValidator(ctx sdk.Context, msg types.MsgCreateValidator, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgCreateValidator(ctx sdk.Context, msg types.MsgCreateValidator, k keeper.Keeper) sdk.Result {
 
 	// check to see if the pubkey or sender has been registered before
 	_, found := k.GetValidator(ctx, msg.ValidatorAddr)
@@ -99,7 +99,7 @@ func handleMsgCreateValidator(ctx sdk.Context, msg types.MsgCreateValidator, k k
 	}
 }
 
-func handleMsgEditValidator(ctx sdk.Context, msg types.MsgEditValidator, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgEditValidator(ctx sdk.Context, msg types.MsgEditValidator, k keeper.Keeper) sdk.Result {
 
 	// validator must already be registered
 	validator, found := k.GetValidator(ctx, msg.ValidatorAddr)
@@ -126,7 +126,7 @@ func handleMsgEditValidator(ctx sdk.Context, msg types.MsgEditValidator, k keepe
 	}
 }
 
-func handleMsgDelegate(ctx sdk.Context, msg types.MsgDelegate, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgDelegate(ctx sdk.Context, msg types.MsgDelegate, k keeper.Keeper) sdk.Result {
 
 	validator, found := k.GetValidator(ctx, msg.ValidatorAddr)
 	if !found {
@@ -155,7 +155,7 @@ func handleMsgDelegate(ctx sdk.Context, msg types.MsgDelegate, k keeper.Privileg
 	}
 }
 
-func handleMsgBeginUnbonding(ctx sdk.Context, msg types.MsgBeginUnbonding, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgBeginUnbonding(ctx sdk.Context, msg types.MsgBeginUnbonding, k keeper.Keeper) sdk.Result {
 
 	delegation, validator, pool, returnAmount, err := k.UnbondDelegation(ctx, msg.DelegatorAddr, msg.ValidatorAddr, msg.SharesAmount)
 	if err != nil {
@@ -193,7 +193,7 @@ func handleMsgBeginUnbonding(ctx sdk.Context, msg types.MsgBeginUnbonding, k kee
 	return sdk.Result{Tags: tags}
 }
 
-func handleMsgCompleteUnbonding(ctx sdk.Context, msg types.MsgCompleteUnbonding, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgCompleteUnbonding(ctx sdk.Context, msg types.MsgCompleteUnbonding, k keeper.Keeper) sdk.Result {
 
 	ubd, found := k.GetUnbondingDelegation(ctx, msg.DelegatorAddr, msg.ValidatorAddr)
 	if !found {
@@ -230,7 +230,7 @@ func handleMsgCompleteUnbonding(ctx sdk.Context, msg types.MsgCompleteUnbonding,
 	return sdk.Result{Tags: tags}
 }
 
-func handleMsgBeginRedelegate(ctx sdk.Context, msg types.MsgBeginRedelegate, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgBeginRedelegate(ctx sdk.Context, msg types.MsgBeginRedelegate, k keeper.Keeper) sdk.Result {
 
 	delegation, srcValidator, pool, returnAmount, err := k.UnbondDelegation(ctx, msg.DelegatorAddr, msg.ValidatorSrcAddr, msg.SharesAmount)
 	if err != nil {
@@ -278,7 +278,7 @@ func handleMsgBeginRedelegate(ctx sdk.Context, msg types.MsgBeginRedelegate, k k
 	return sdk.Result{Tags: tags}
 }
 
-func handleMsgCompleteRedelegate(ctx sdk.Context, msg types.MsgCompleteRedelegate, k keeper.PrivilegedKeeper) sdk.Result {
+func handleMsgCompleteRedelegate(ctx sdk.Context, msg types.MsgCompleteRedelegate, k keeper.Keeper) sdk.Result {
 
 	red, found := k.GetRedelegation(ctx, msg.DelegatorAddr, msg.ValidatorSrcAddr, msg.ValidatorDstAddr)
 	if !found {

diff --git a/x/stake/keeper/delegation.go b/x/stake/keeper/delegation.go
@@ -22,7 +22,7 @@ func (k Keeper) GetDelegation(ctx sdk.Context,
 }
 
 // load all delegations used during genesis dump
-func (k PrivilegedKeeper) GetAllDelegations(ctx sdk.Context) (delegations []types.Delegation) {
+func (k Keeper) GetAllDelegations(ctx sdk.Context) (delegations []types.Delegation) {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, DelegationKey)
 
@@ -66,20 +66,20 @@ func (k Keeper) GetDelegations(ctx sdk.Context, delegator sdk.Address,
 }
 
 // set the delegation
-func (k PrivilegedKeeper) SetDelegation(ctx sdk.Context, delegation types.Delegation) {
+func (k Keeper) SetDelegation(ctx sdk.Context, delegation types.Delegation) {
 	store := ctx.KVStore(k.storeKey)
 	b := k.cdc.MustMarshalBinary(delegation)
 	store.Set(GetDelegationKey(delegation.DelegatorAddr, delegation.ValidatorAddr, k.cdc), b)
 }
 
 // remove the delegation
-func (k PrivilegedKeeper) RemoveDelegation(ctx sdk.Context, delegation types.Delegation) {
+func (k Keeper) RemoveDelegation(ctx sdk.Context, delegation types.Delegation) {
 	store := ctx.KVStore(k.storeKey)
 	store.Delete(GetDelegationKey(delegation.DelegatorAddr, delegation.ValidatorAddr, k.cdc))
 }
 
 // common functionality between handlers
-func (k PrivilegedKeeper) Delegate(ctx sdk.Context, delegatorAddr sdk.Address, bondAmt sdk.Coin,
+func (k Keeper) Delegate(ctx sdk.Context, delegatorAddr sdk.Address, bondAmt sdk.Coin,
 	validator types.Validator) (newShares sdk.Rat, delegation types.Delegation,
 	validator2 types.Validator, pool types.Pool, err sdk.Error) {
 
@@ -126,7 +126,7 @@ func (k Keeper) GetUnbondingDelegation(ctx sdk.Context,
 }
 
 // set the unbonding delegation and associated index
-func (k PrivilegedKeeper) SetUnbondingDelegation(ctx sdk.Context, ubd types.UnbondingDelegation) {
+func (k Keeper) SetUnbondingDelegation(ctx sdk.Context, ubd types.UnbondingDelegation) {
 	store := ctx.KVStore(k.storeKey)
 	bz := k.cdc.MustMarshalBinary(ubd)
 	ubdKey := GetUBDKey(ubd.DelegatorAddr, ubd.ValidatorAddr, k.cdc)
@@ -135,15 +135,15 @@ func (k PrivilegedKeeper) SetUnbondingDelegation(ctx sdk.Context, ubd types.Unbo
 }
 
 // remove the unbonding delegation object and associated index
-func (k PrivilegedKeeper) RemoveUnbondingDelegation(ctx sdk.Context, ubd types.UnbondingDelegation) {
+func (k Keeper) RemoveUnbondingDelegation(ctx sdk.Context, ubd types.UnbondingDelegation) {
 	store := ctx.KVStore(k.storeKey)
 	ubdKey := GetUBDKey(ubd.DelegatorAddr, ubd.ValidatorAddr, k.cdc)
 	store.Delete(ubdKey)
 	store.Delete(GetUBDByValIndexKey(ubd.DelegatorAddr, ubd.ValidatorAddr, k.cdc))
 }
 
 // unbond the the delegation return
-func (k PrivilegedKeeper) UnbondDelegation(ctx sdk.Context, delegatorAddr, validatorAddr sdk.Address,
+func (k Keeper) UnbondDelegation(ctx sdk.Context, delegatorAddr, validatorAddr sdk.Address,
 	shares sdk.Rat) (delegation types.Delegation, validator types.Validator, pool types.Pool, amount int64, err sdk.Error) {
 
 	// check if delegation has any shares in it unbond
@@ -229,7 +229,7 @@ func (k Keeper) GetRedelegationDel(ctx sdk.Context, DelegatorAddr, ValidatorSrcA
 }
 
 // set a redelegation and associated index
-func (k PrivilegedKeeper) SetRedelegation(ctx sdk.Context, red types.Redelegation) {
+func (k Keeper) SetRedelegation(ctx sdk.Context, red types.Redelegation) {
 	store := ctx.KVStore(k.storeKey)
 	bz := k.cdc.MustMarshalBinary(red)
 	redKey := GetREDKey(red.DelegatorAddr, red.ValidatorSrcAddr, red.ValidatorDstAddr, k.cdc)
@@ -239,7 +239,7 @@ func (k PrivilegedKeeper) SetRedelegation(ctx sdk.Context, red types.Redelegatio
 }
 
 // remove a redelegation object and associated index
-func (k PrivilegedKeeper) RemoveRedelegation(ctx sdk.Context, red types.Redelegation) {
+func (k Keeper) RemoveRedelegation(ctx sdk.Context, red types.Redelegation) {
 	store := ctx.KVStore(k.storeKey)
 	redKey := GetREDKey(red.DelegatorAddr, red.ValidatorSrcAddr, red.ValidatorDstAddr, k.cdc)
 	store.Delete(redKey)

diff --git a/x/stake/keeper/genesis.go b/x/stake/keeper/genesis.go
@@ -8,7 +8,7 @@ import (
 )
 
 // InitGenesis - store genesis parameters
-func (k PrivilegedKeeper) InitGenesis(ctx sdk.Context, data types.GenesisState) {
+func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) {
 	store := ctx.KVStore(k.storeKey)
 	k.SetPool(ctx, data.Pool)
 	k.SetNewParams(ctx, data.Params)
@@ -31,7 +31,7 @@ func (k PrivilegedKeeper) InitGenesis(ctx sdk.Context, data types.GenesisState)
 }
 
 // WriteGenesis - output genesis parameters
-func (k PrivilegedKeeper) WriteGenesis(ctx sdk.Context) types.GenesisState {
+func (k Keeper) WriteGenesis(ctx sdk.Context) types.GenesisState {
 	pool := k.GetPool(ctx)
 	params := k.GetParams(ctx)
 	validators := k.GetAllValidators(ctx)

diff --git a/x/stake/keeper/inflation_test.go b/x/stake/keeper/inflation_test.go
@@ -290,7 +290,7 @@ func checkFinalPoolValues(t *testing.T, pool types.Pool, initialTotalTokens, cum
 
 // Processes provisions are added to the pool correctly every hour
 // Returns expected Provisions, expected Inflation, and pool, to help with cumulative calculations back in main Tests
-func updateProvisions(t *testing.T, keeper PrivilegedKeeper, pool types.Pool, ctx sdk.Context, hr int) (sdk.Rat, int64, types.Pool) {
+func updateProvisions(t *testing.T, keeper Keeper, pool types.Pool, ctx sdk.Context, hr int) (sdk.Rat, int64, types.Pool) {
 	expInflation := keeper.NextInflation(ctx)
 	expProvisions := (expInflation.Mul(sdk.NewRat(pool.TokenSupply())).Quo(hrsPerYrRat)).Evaluate()
 	startTotalSupply := pool.TokenSupply()
@@ -306,8 +306,8 @@ func updateProvisions(t *testing.T, keeper PrivilegedKeeper, pool types.Pool, ct
 // Deterministic setup of validators and pool
 // Allows you to decide how many validators to setup
 // Allows you to pick which validators are bonded by adjusting the MaxValidators of params
-func setupTestValidators(pool types.Pool, keeper PrivilegedKeeper, ctx sdk.Context, validatorTokens []int64,
-	maxValidators uint16) ([]types.Validator, PrivilegedKeeper, types.Pool) {
+func setupTestValidators(pool types.Pool, keeper Keeper, ctx sdk.Context, validatorTokens []int64,
+	maxValidators uint16) ([]types.Validator, Keeper, types.Pool) {
 
 	params := types.DefaultParams()
 	params.MaxValidators = maxValidators