refactor(x/ecocredit): remove deprecated params keeper (#1543)

Co-authored-by: Ryan Christoffersen <12519942+ryanchristo@users.noreply.github.com>
regen-network · Oct 19, 2022 · 98e6571 · 98e6571
1 parent a128c39
commit 98e6571
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 101 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1462](https://github.com/regen-network/regen-ledger/pull/1462) Bridge operations must now specify a target/source that exists in the `AllowedBridgeChain` table.
 - [#1476](https://github.com/regen-network/regen-ledger/pull/1476) `DefaultParams` function has been removed.
 - [#1476](https://github.com/regen-network/regen-ledger/pull/1476) Remove `params` argument from `ValidateGenesis`.
+- [#1543](https://github.com/regen-network/regen-ledger/pull/1543) Remove `paramsKeeper` argument from `base/Keeper`, `basket/Keeper` and `marketplace/Keeper`.
 
 #### Added
 

diff --git a/api/regen/ecocredit/v1/tx_grpc.pb.go b/api/regen/ecocredit/v1/tx_grpc.pb.go
diff --git a/proto/regen/ecocredit/v1/tx.proto b/proto/regen/ecocredit/v1/tx.proto
@@ -136,7 +136,7 @@ service Msg {
   rpc AddClassCreator(MsgAddClassCreator) returns (MsgAddClassCreatorResponse);
 
   // RemoveClassCreator is a governance method that removes
-  // address from the creation allowlist.
+  // address from the class creation allowlist.
   //
   // Since Revision 1
   rpc RemoveClassCreator(MsgRemoveClassCreator)

diff --git a/x/ecocredit/base/types/v1/tx.pb.go b/x/ecocredit/base/types/v1/tx.pb.go
diff --git a/x/ecocredit/basket/keeper/keeper.go b/x/ecocredit/basket/keeper/keeper.go
@@ -19,7 +19,6 @@ type Keeper struct {
 	stateStore    api.StateStore
 	baseStore     baseapi.StateStore
 	bankKeeper    ecocredit.BankKeeper
-	paramsKeeper  ecocredit.ParamKeeper
 	moduleAddress sdk.AccAddress
 	authority     sdk.AccAddress
 }
@@ -29,15 +28,13 @@ func NewKeeper(
 	ss api.StateStore,
 	cs baseapi.StateStore,
 	bk ecocredit.BankKeeper,
-	pk ecocredit.ParamKeeper,
 	ma sdk.AccAddress,
 	authority sdk.AccAddress,
 ) Keeper {
 	return Keeper{
 		stateStore:    ss,
 		baseStore:     cs,
 		bankKeeper:    bk,
-		paramsKeeper:  pk,
 		moduleAddress: ma,
 		authority:     authority,
 	}

diff --git a/x/ecocredit/basket/keeper/keeper_test.go b/x/ecocredit/basket/keeper/keeper_test.go
@@ -32,18 +32,17 @@ const (
 )
 
 type baseSuite struct {
-	t            gocuke.TestingT
-	db           ormdb.ModuleDB
-	ctx          context.Context
-	k            Keeper
-	ctrl         *gomock.Controller
-	addrs        []sdk.AccAddress
-	stateStore   api.StateStore
-	baseStore    baseapi.StateStore
-	bankKeeper   *mocks.MockBankKeeper
-	paramsKeeper *mocks.MockParamKeeper
-	storeKey     *storetypes.KVStoreKey
-	sdkCtx       sdk.Context
+	t          gocuke.TestingT
+	db         ormdb.ModuleDB
+	ctx        context.Context
+	k          Keeper
+	ctrl       *gomock.Controller
+	addrs      []sdk.AccAddress
+	stateStore api.StateStore
+	baseStore  baseapi.StateStore
+	bankKeeper *mocks.MockBankKeeper
+	storeKey   *storetypes.KVStoreKey
+	sdkCtx     sdk.Context
 }
 
 func setupBase(t gocuke.TestingT) *baseSuite {
@@ -70,13 +69,12 @@ func setupBase(t gocuke.TestingT) *baseSuite {
 	s.ctrl = gomock.NewController(t)
 	assert.NilError(t, err)
 	s.bankKeeper = mocks.NewMockBankKeeper(s.ctrl)
-	s.paramsKeeper = mocks.NewMockParamKeeper(s.ctrl)
 
 	_, _, moduleAddress := testdata.KeyTestPubAddr()
 	authority, err := sdk.AccAddressFromBech32("regen1nzh226hxrsvf4k69sa8v0nfuzx5vgwkczk8j68")
 	assert.NilError(t, err)
 
-	s.k = NewKeeper(s.stateStore, s.baseStore, s.bankKeeper, s.paramsKeeper, moduleAddress, authority)
+	s.k = NewKeeper(s.stateStore, s.baseStore, s.bankKeeper, moduleAddress, authority)
 	s.baseStore, err = baseapi.NewStateStore(s.db)
 	assert.NilError(t, err)
 

diff --git a/x/ecocredit/expected_keepers.go b/x/ecocredit/expected_keepers.go
@@ -5,7 +5,6 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
-	"github.com/cosmos/cosmos-sdk/x/params/types"
 )
 
 //go:generate mockgen -source=expected_keepers.go -package mocks -destination mocks/expected_keepers.go
@@ -43,13 +42,3 @@ type GovKeeper interface {
 	// GetDepositParams queries governance module deposit params
 	GetDepositParams(ctx sdk.Context) govv1.DepositParams
 }
-
-type ParamKeeper interface {
-
-	// Get fetches a parameter by key from the Subspace's KVStore and sets the provided pointer to the fetched value.
-	// If the value does not exist, this method will panic.
-	Get(ctx sdk.Context, key []byte, ptr interface{})
-
-	// GetParamSet fetches each parameter in the ParamSet.
-	GetParamSet(ctx sdk.Context, ps types.ParamSet)
-}
diff --git a/x/ecocredit/marketplace/keeper/keeper.go b/x/ecocredit/marketplace/keeper/keeper.go
@@ -15,20 +15,18 @@ var (
 )
 
 type Keeper struct {
-	stateStore   marketapi.StateStore
-	baseStore    baseapi.StateStore
-	bankKeeper   ecocredit.BankKeeper
-	paramsKeeper ecocredit.ParamKeeper
-	authority    sdk.AccAddress
+	stateStore marketapi.StateStore
+	baseStore  baseapi.StateStore
+	bankKeeper ecocredit.BankKeeper
+	authority  sdk.AccAddress
 }
 
 func NewKeeper(ss marketapi.StateStore, cs baseapi.StateStore, bk ecocredit.BankKeeper,
-	params ecocredit.ParamKeeper, authority sdk.AccAddress) Keeper {
+	authority sdk.AccAddress) Keeper {
 	return Keeper{
-		baseStore:    cs,
-		stateStore:   ss,
-		bankKeeper:   bk,
-		paramsKeeper: params,
-		authority:    authority,
+		baseStore:  cs,
+		stateStore: ss,
+		bankKeeper: bk,
+		authority:  authority,
 	}
 }
diff --git a/x/ecocredit/marketplace/keeper/keeper_test.go b/x/ecocredit/marketplace/keeper/keeper_test.go
@@ -36,18 +36,17 @@ const (
 )
 
 type baseSuite struct {
-	t            gocuke.TestingT
-	db           ormdb.ModuleDB
-	baseStore    baseapi.StateStore
-	marketStore  api.StateStore
-	ctx          context.Context
-	k            Keeper
-	ctrl         *gomock.Controller
-	addrs        []sdk.AccAddress
-	bankKeeper   *mocks.MockBankKeeper
-	paramsKeeper *mocks.MockParamKeeper
-	storeKey     *storetypes.KVStoreKey
-	sdkCtx       sdk.Context
+	t           gocuke.TestingT
+	db          ormdb.ModuleDB
+	baseStore   baseapi.StateStore
+	marketStore api.StateStore
+	ctx         context.Context
+	k           Keeper
+	ctrl        *gomock.Controller
+	addrs       []sdk.AccAddress
+	bankKeeper  *mocks.MockBankKeeper
+	storeKey    *storetypes.KVStoreKey
+	sdkCtx      sdk.Context
 }
 
 func setupBase(t gocuke.TestingT, numAddresses int) *baseSuite {
@@ -74,11 +73,10 @@ func setupBase(t gocuke.TestingT, numAddresses int) *baseSuite {
 	s.ctrl = gomock.NewController(t)
 	assert.NilError(t, err)
 	s.bankKeeper = mocks.NewMockBankKeeper(s.ctrl)
-	s.paramsKeeper = mocks.NewMockParamKeeper(s.ctrl)
 
 	authority, err := sdk.AccAddressFromBech32("regen1nzh226hxrsvf4k69sa8v0nfuzx5vgwkczk8j68")
 	assert.NilError(s.t, err)
-	s.k = NewKeeper(s.marketStore, s.baseStore, s.bankKeeper, s.paramsKeeper, authority)
+	s.k = NewKeeper(s.marketStore, s.baseStore, s.bankKeeper, authority)
 
 	// set test accounts
 	for i := 0; i < numAddresses; i++ {

diff --git a/x/ecocredit/mocks/expected_keepers.go b/x/ecocredit/mocks/expected_keepers.go
diff --git a/x/ecocredit/module/module.go b/x/ecocredit/module/module.go
@@ -120,7 +120,7 @@ func (m Module) RegisterInterfaces(registry types.InterfaceRegistry) {
 
 // RegisterServices implements AppModule/RegisterServices.
 func (m *Module) RegisterServices(cfg module.Configurator) {
-	svr := server.NewServer(m.key, m.legacySubspace, m.accountKeeper, m.bankKeeper, m.authority)
+	svr := server.NewServer(m.key, m.accountKeeper, m.bankKeeper, m.authority)
 	basetypes.RegisterMsgServer(cfg.MsgServer(), svr.BaseKeeper)
 	basetypes.RegisterQueryServer(cfg.QueryServer(), svr.BaseKeeper)
 

diff --git a/x/ecocredit/server/server.go b/x/ecocredit/server/server.go
@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/orm/model/ormdb"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	basketapi "github.com/regen-network/regen-ledger/api/regen/ecocredit/basket/v1"
 	marketapi "github.com/regen-network/regen-ledger/api/regen/ecocredit/marketplace/v1"
@@ -23,9 +22,8 @@ import (
 )
 
 type serverImpl struct {
-	legacySubspace paramtypes.Subspace
-	bankKeeper     ecocredit.BankKeeper
-	accountKeeper  ecocredit.AccountKeeper
+	bankKeeper    ecocredit.BankKeeper
+	accountKeeper ecocredit.AccountKeeper
 
 	BaseKeeper        basekeeper.Keeper
 	BasketKeeper      basketkeeper.Keeper
@@ -38,12 +36,11 @@ type serverImpl struct {
 }
 
 //nolint:revive
-func NewServer(storeKey storetypes.StoreKey, legacySubspace paramtypes.Subspace,
+func NewServer(storeKey storetypes.StoreKey,
 	accountKeeper ecocredit.AccountKeeper, bankKeeper ecocredit.BankKeeper, authority sdk.AccAddress) serverImpl {
 	s := serverImpl{
-		legacySubspace: legacySubspace,
-		bankKeeper:     bankKeeper,
-		accountKeeper:  accountKeeper,
+		bankKeeper:    bankKeeper,
+		accountKeeper: accountKeeper,
 	}
 
 	// ensure ecocredit module account is set
@@ -69,8 +66,8 @@ func NewServer(storeKey storetypes.StoreKey, legacySubspace paramtypes.Subspace,
 	s.basketStore = basketStore
 	s.marketplaceStore = marketStore
 	s.BaseKeeper = basekeeper.NewKeeper(baseStore, bankKeeper, baseAddr, basketStore, marketStore, authority)
-	s.BasketKeeper = basketkeeper.NewKeeper(basketStore, baseStore, bankKeeper, s.legacySubspace, basketAddr, authority)
-	s.MarketplaceKeeper = marketkeeper.NewKeeper(marketStore, baseStore, bankKeeper, s.legacySubspace, authority)
+	s.BasketKeeper = basketkeeper.NewKeeper(basketStore, baseStore, bankKeeper, basketAddr, authority)
+	s.MarketplaceKeeper = marketkeeper.NewKeeper(marketStore, baseStore, bankKeeper, authority)
 
 	return s
 }