refactor: remove authz dependency from test suite and EvmApp interface

CHANGELOG.md

@@ -9,6 +9,7 @@
 - [\#758](https://github.com/cosmos/evm/pull/758) Cleanup precompiles abi.json.
 - [\#810](https://github.com/cosmos/evm/pull/810) Fix integration test suite to resolve lock contention problem from external app injection
 - [\#811](https://github.com/cosmos/evm/pull/811) Use sdk's DefaultBondDenom for default evm denom in genesis.
+- [\#823](https://github.com/cosmos/evm/pull/823) Remove authz dependency from test suite and EvmApp interface
 
 ### FEATURES
 

evmd/app.go

@@ -1022,10 +1022,6 @@ func (app *EVMD) GetAccountKeeper() authkeeper.AccountKeeper {
 	return app.AccountKeeper
 }
 
-func (app *EVMD) GetAuthzKeeper() authzkeeper.Keeper {
-	return app.AuthzKeeper
-}
-
 func (app *EVMD) GetDistrKeeper() distrkeeper.Keeper {
 	return app.DistrKeeper
 }

interfaces.go

@@ -21,7 +21,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/mempool"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
@@ -46,7 +45,6 @@ type EvmApp interface { //nolint:revive
 	GetBankKeeper() bankkeeper.Keeper
 	GetFeeMarketKeeper() *feemarketkeeper.Keeper
 	GetAccountKeeper() authkeeper.AccountKeeper
-	GetAuthzKeeper() authzkeeper.Keeper
 	GetDistrKeeper() distrkeeper.Keeper
 	GetStakingKeeper() *stakingkeeper.Keeper
 	GetMintKeeper() mintkeeper.Keeper

testutil/integration/base/grpc/grpc.go

@@ -5,7 +5,6 @@ import (
 	precisebanktypes "github.com/cosmos/evm/x/precisebank/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -17,14 +16,6 @@ type Handler interface {
 	// Account methods
 	GetAccount(address string) (sdk.AccountI, error)
 
-	// Authz methods
-	GetAuthorizations(grantee, granter string) ([]authz.Authorization, error)
-	GetAuthorizationsByGrantee(grantee string) ([]authz.Authorization, error)
-	GetAuthorizationsByGranter(granter string) ([]authz.Authorization, error)
-	GetGrants(grantee, granter string) ([]*authz.Grant, error)
-	GetGrantsByGrantee(grantee string) ([]*authz.GrantAuthorization, error)
-	GetGrantsByGranter(granter string) ([]*authz.GrantAuthorization, error)
-
 	// Bank methods
 	GetBalanceFromBank(address sdk.AccAddress, denom string) (*banktypes.QueryBalanceResponse, error)
 	GetSpendableBalance(address sdk.AccAddress, denom string) (*banktypes.QuerySpendableBalanceByDenomResponse, error)

testutil/integration/base/network/network.go

@@ -13,7 +13,6 @@ import (
 	sdktestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -36,7 +35,6 @@ type Network interface {
 
 	// Clients
 	GetAuthClient() authtypes.QueryClient
-	GetAuthzClient() authz.QueryClient
 	GetBankClient() banktypes.QueryClient
 	GetPreciseBankClient() precisebanktypes.QueryClient
 	GetStakingClient() stakingtypes.QueryClient

testutil/integration/evm/network/clients.go

@@ -12,7 +12,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module/testutil"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
@@ -69,12 +68,6 @@ func (n *IntegrationNetwork) GetAuthClient() authtypes.QueryClient {
 	return authtypes.NewQueryClient(queryHelper)
 }
 
-func (n *IntegrationNetwork) GetAuthzClient() authz.QueryClient {
-	queryHelper := getQueryHelper(n.GetContext(), n.GetEncodingConfig())
-	authz.RegisterQueryServer(queryHelper, n.app.GetAuthzKeeper())
-	return authz.NewQueryClient(queryHelper)
-}
-
 func (n *IntegrationNetwork) GetStakingClient() stakingtypes.QueryClient {
 	queryHelper := getQueryHelper(n.GetContext(), n.GetEncodingConfig())
 	stakingtypes.RegisterQueryServer(queryHelper, stakingkeeper.Querier{Keeper: n.app.GetStakingKeeper()})