remove getParams in observer

x/crosschain/keeper/msg_server_add_to_intx_tracker_test.go

@@ -16,7 +16,7 @@ import (
 )
 
 func setupVerificationParams(zk keepertest.ZetaKeepers, ctx sdk.Context, tx_index int64, chainID int64, header ethtypes.Header, headerRLP []byte, block *ethtypes.Block) {
-	params := zk.ObserverKeeper.GetParams(ctx)
+	params := zk.ObserverKeeper.GetParamsIfExists(ctx)
 	zk.ObserverKeeper.SetParams(ctx, params)
 	zk.ObserverKeeper.SetBlockHeader(ctx, common.BlockHeader{
 		Height:     block.Number().Int64(),

x/crosschain/types/expected_keepers.go

@@ -33,7 +33,6 @@ type BankKeeper interface {
 type ObserverKeeper interface {
 	GetObserverSet(ctx sdk.Context) (val observertypes.ObserverSet, found bool)
 	GetBallot(ctx sdk.Context, index string) (val observertypes.Ballot, found bool)
-	GetParams(ctx sdk.Context) (params observertypes.Params)
 	GetChainParamsByChainID(ctx sdk.Context, chainID int64) (params *observertypes.ChainParams, found bool)
 	GetNodeAccount(ctx sdk.Context, address string) (nodeAccount observertypes.NodeAccount, found bool)
 	GetAllNodeAccount(ctx sdk.Context) (nodeAccounts []observertypes.NodeAccount)

x/fungible/types/expected_keepers.go

@@ -13,7 +13,6 @@ import (
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/zeta-chain/zetacore/common"
 	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
-	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
 // AccountKeeper defines the expected account keeper used for simulations (noalias)
@@ -32,7 +31,6 @@ type BankKeeper interface {
 }
 
 type ObserverKeeper interface {
-	GetParams(ctx sdk.Context) (params observertypes.Params)
 	GetSupportedChains(ctx sdk.Context) []*common.Chain
 }
 

x/observer/genesis.go

@@ -141,7 +141,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 
 // ExportGenesis returns the observer module's exported genesis.
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
-	params := k.GetParams(ctx)
+	params := k.GetParamsIfExists(ctx)
 
 	chainParams, found := k.GetChainParamsList(ctx)
 	if !found {

x/observer/keeper/ballot.go

@@ -63,7 +63,7 @@ func (k Keeper) AddBallotToList(ctx sdk.Context, ballot types.Ballot) {
 
 // GetMaturedBallotList Returns a list of ballots which are matured at current height
 func (k Keeper) GetMaturedBallotList(ctx sdk.Context) []string {
-	maturityBlocks := k.GetParams(ctx).BallotMaturityBlocks
+	maturityBlocks := k.GetParamsIfExists(ctx).BallotMaturityBlocks
 	list, found := k.GetBallotList(ctx, ctx.BlockHeight()-maturityBlocks)
 	if !found {
 		return []string{}

x/observer/keeper/grpc_query_params.go

@@ -15,5 +15,5 @@ func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types
 	}
 	ctx := sdk.UnwrapSDKContext(c)
 	return &types.QueryParamsResponse{
-		Params: k.GetParams(ctx)}, nil
+		Params: k.GetParamsIfExists(ctx)}, nil
 }

x/observer/keeper/params.go

@@ -5,12 +5,6 @@ import (
 	"github.com/zeta-chain/zetacore/x/observer/types"
 )
 
-// GetParams get all parameters as types.Params
-func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
-	k.paramstore.GetParamSet(ctx, &params)
-	return
-}
-
 func (k Keeper) GetParamsIfExists(ctx sdk.Context) (params types.Params) {
 	k.paramstore.GetParamSetIfExists(ctx, &params)
 	return

x/observer/keeper/params_test.go

@@ -18,7 +18,7 @@ func TestGetParams(t *testing.T) {
 
 	k.SetParams(ctx, params)
 
-	require.EqualValues(t, params, k.GetParams(ctx))
+	require.EqualValues(t, params, k.GetParamsIfExists(ctx))
 }
 
 func TestGenerateAddress(t *testing.T) {

x/observer/migrations/v3/migrate_test.go

@@ -19,7 +19,7 @@ func TestMigrateStore(t *testing.T) {
 	k.SetParams(ctx, params)
 	err := v3.MigrateStore(ctx, k)
 	require.NoError(t, err)
-	params = k.GetParams(ctx)
+	params = k.GetParamsIfExists(ctx)
 	require.Len(t, params.AdminPolicy, 0)
 
 	// update admin policy
@@ -42,7 +42,7 @@ func TestMigrateStore(t *testing.T) {
 	k.SetParams(ctx, params)
 	err = v3.MigrateStore(ctx, k)
 	require.NoError(t, err)
-	params = k.GetParams(ctx)
+	params = k.GetParamsIfExists(ctx)
 	require.Len(t, params.AdminPolicy, 2)
 	require.Equal(t, params.AdminPolicy[0].PolicyType, types.Policy_Type_group1)
 	require.Equal(t, params.AdminPolicy[1].PolicyType, types.Policy_Type_group2)

x/observer/migrations/v4/migrate.go

@@ -10,7 +10,6 @@ import (
 
 // observerKeeper prevents circular dependency
 type observerKeeper interface {
-	GetParams(ctx sdk.Context) types.Params
 	SetParams(ctx sdk.Context, params types.Params)
 	GetChainParamsList(ctx sdk.Context) (params types.ChainParamsList, found bool)
 	SetChainParamsList(ctx sdk.Context, params types.ChainParamsList)

x/observer/migrations/v5/migrate.go

@@ -10,7 +10,7 @@ import (
 
 // observerKeeper prevents circular dependency
 type observerKeeper interface {
-	GetParams(ctx sdk.Context) types.Params
+	GetParamsIfExists(ctx sdk.Context) types.Params
 	SetParams(ctx sdk.Context, params types.Params)
 	GetChainParamsList(ctx sdk.Context) (params types.ChainParamsList, found bool)
 	SetChainParamsList(ctx sdk.Context, params types.ChainParamsList)
@@ -64,7 +64,7 @@ func MigrateObserverParams(ctx sdk.Context, observerKeeper observerKeeper) error
 	}
 
 	// search for the observer params with chain params entry
-	observerParams := observerKeeper.GetParams(ctx).ObserverParams
+	observerParams := observerKeeper.GetParamsIfExists(ctx).ObserverParams
 	for _, observerParam := range observerParams {
 		for i := range chainParamsList.ChainParams {
 			// if the chain is found, update the chain params with the observer params

x/observer/migrations/v7/migrate.go

@@ -8,7 +8,7 @@ import (
 
 // observerKeeper prevents circular dependency
 type observerKeeper interface {
-	GetParams(ctx sdk.Context) (params types.Params)
+	GetParamsIfExists(ctx sdk.Context) (params types.Params)
 	GetAuthorityKeeper() types.AuthorityKeeper
 }
 
@@ -19,7 +19,7 @@ func MigrateStore(ctx sdk.Context, observerKeeper observerKeeper) error {
 
 // MigratePolicies migrates policies from observer to authority
 func MigratePolicies(ctx sdk.Context, observerKeeper observerKeeper) error {
-	params := observerKeeper.GetParams(ctx)
+	params := observerKeeper.GetParamsIfExists(ctx)
 	authorityKeeper := observerKeeper.GetAuthorityKeeper()
 
 	var policies authoritytypes.Policies