slashing

x/slashing/depinject.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	modulev1 "cosmossdk.io/api/cosmos/slashing/module/v1"
+	"cosmossdk.io/core/address"
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/comet"
 	"cosmossdk.io/depinject"
@@ -37,8 +38,8 @@ type ModuleInputs struct {
 	Cdc          codec.Codec
 	Registry     cdctypes.InterfaceRegistry
 	CometService comet.Service
+	AddressCdc   address.Codec
 
-	AccountKeeper types.AccountKeeper
 	BankKeeper    types.BankKeeper
 	StakingKeeper types.StakingKeeper
 }
@@ -58,13 +59,13 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 		authority = authtypes.NewModuleAddressOrBech32Address(in.Config.Authority)
 	}
 
-	authStr, err := in.AccountKeeper.AddressCodec().BytesToString(authority)
+	authStr, err := in.AddressCdc.BytesToString(authority)
 	if err != nil {
 		panic(fmt.Errorf("unable to decode authority in slashing: %w", err))
 	}
 
 	k := keeper.NewKeeper(in.Environment, in.Cdc, nil, in.StakingKeeper, authStr)
-	m := NewAppModule(in.Cdc, k, in.AccountKeeper, in.BankKeeper, in.StakingKeeper, in.Registry, in.CometService)
+	m := NewAppModule(in.Cdc, k, in.BankKeeper, in.StakingKeeper, in.Registry, in.CometService)
 	return ModuleOutputs{
 		Keeper: k,
 		Module: m,

x/slashing/go.mod

@@ -173,6 +173,7 @@ replace github.com/cosmos/cosmos-sdk => ../../.
 // TODO remove post spinning out all modules
 replace (
 	cosmossdk.io/api => ../../api
+	cosmossdk.io/core => ../../core
 	cosmossdk.io/store => ../../store
 	cosmossdk.io/x/bank => ../bank
 	cosmossdk.io/x/staking => ../staking

x/slashing/module.go

@@ -51,7 +51,6 @@ type AppModule struct {
 func NewAppModule(
 	cdc codec.Codec,
 	keeper keeper.Keeper,
-	ak types.AccountKeeper,
 	bk types.BankKeeper,
 	sk types.StakingKeeper,
 	registry cdctypes.InterfaceRegistry,

x/slashing/types/expected_keepers.go

@@ -11,12 +11,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// AccountKeeper expected account keeper
-type AccountKeeper interface {
-	AddressCodec() address.Codec
-	GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
-}
-
 // BankKeeper defines the expected interface needed to retrieve account balances.
 type BankKeeper interface {
 	GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins