refactor(x/ecocredit): migrate ecocredit server to submodules

app/app.go

@@ -384,7 +384,6 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		app.BankKeeper,
 		app.DistrKeeper,
 	)
-
 	dataModule := data.NewModule(app.AccountKeeper, app.BankKeeper)
 	newModules := []moduletypes.Module{ecocreditModule, dataModule}
 	err := app.smm.RegisterModules(newModules)

app/testsuite/modules_test.go

@@ -6,13 +6,12 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	data "github.com/regen-network/regen-ledger/x/data/client/testsuite"
-	ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
+	"github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
 )
 
 func TestEcocreditIntegration(t *testing.T) {
 	cfg := DefaultConfig()
-
-	ecocredit.RunCLITests(t, cfg)
+	testsuite.RunCLITests(t, cfg)
 }
 
 func TestDataIntegration(t *testing.T) {

types/module/server/testutil.go

@@ -6,22 +6,23 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/regen-network/regen-ledger/types/testutil"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/require"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
-	"google.golang.org/grpc"
 
 	regentypes "github.com/regen-network/regen-ledger/types"
 	"github.com/regen-network/regen-ledger/types/module"
+	"github.com/regen-network/regen-ledger/types/testutil"
 )
 
 type FixtureFactory struct {

x/data/server/operations.go

@@ -1,6 +1,5 @@
 package server
 
-
 import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"

x/ecocredit/module/module.go

@@ -13,6 +13,8 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
+	abci "github.com/tendermint/tendermint/abci/types"
+
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
@@ -22,15 +24,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 
 	climodule "github.com/regen-network/regen-ledger/types/module/client/cli"
 	restmodule "github.com/regen-network/regen-ledger/types/module/client/grpc_gateway"
 	servermodule "github.com/regen-network/regen-ledger/types/module/server"
 	"github.com/regen-network/regen-ledger/x/ecocredit"
 	baskettypes "github.com/regen-network/regen-ledger/x/ecocredit/basket"
 	"github.com/regen-network/regen-ledger/x/ecocredit/client"
-	"github.com/regen-network/regen-ledger/x/ecocredit/core"
 	coretypes "github.com/regen-network/regen-ledger/x/ecocredit/core"
 	marketplacetypes "github.com/regen-network/regen-ledger/x/ecocredit/marketplace"
 	"github.com/regen-network/regen-ledger/x/ecocredit/server"
@@ -53,7 +53,7 @@ func NewModule(
 	distributionKeeper ecocredit.DistributionKeeper,
 ) *Module {
 	if !paramSpace.HasKeyTable() {
-		paramSpace = paramSpace.WithKeyTable(core.ParamKeyTable())
+		paramSpace = paramSpace.WithKeyTable(coretypes.ParamKeyTable())
 	}
 
 	return &Module{
@@ -107,7 +107,7 @@ func (a Module) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
 	}
 
 	params := coretypes.DefaultParams()
-	err = core.MergeParamsIntoTarget(cdc, &params, jsonTarget)
+	err = coretypes.MergeParamsIntoTarget(cdc, &params, jsonTarget)
 	if err != nil {
 		panic(err)
 	}
@@ -150,7 +150,7 @@ func (a Module) ValidateGenesis(cdc codec.JSONCodec, _ sdkclient.TxEncodingConfi
 		return fmt.Errorf("failed to unmarshal %s params state: %w", ecocredit.ModuleName, err)
 	}
 
-	return core.ValidateGenesis(bz, params)
+	return coretypes.ValidateGenesis(bz, params)
 
 }
 

x/ecocredit/server/basket/keeper.go

@@ -5,8 +5,6 @@ import (
 	ecoApi "github.com/regen-network/regen-ledger/api/regen/ecocredit/v1"
 	"github.com/regen-network/regen-ledger/x/ecocredit"
 	baskettypes "github.com/regen-network/regen-ledger/x/ecocredit/basket"
-
-	"github.com/cosmos/cosmos-sdk/orm/model/ormdb"
 )
 
 // Keeper is the basket keeper.
@@ -23,24 +21,17 @@ var _ baskettypes.QueryServer = Keeper{}
 
 // NewKeeper returns a new keeper instance.
 func NewKeeper(
-	db ormdb.ModuleDB,
+	ss api.StateStore,
+	cs ecoApi.StateStore,
 	bankKeeper ecocredit.BankKeeper,
 	distKeeper ecocredit.DistributionKeeper,
 	pk ecocredit.ParamKeeper,
 ) Keeper {
-	basketStore, err := api.NewStateStore(db)
-	if err != nil {
-		panic(err)
-	}
-	coreStore, err := ecoApi.NewStateStore(db)
-	if err != nil {
-		panic(err)
-	}
 	return Keeper{
 		bankKeeper:   bankKeeper,
 		distKeeper:   distKeeper,
-		stateStore:   basketStore,
-		coreStore:    coreStore,
+		stateStore:   ss,
+		coreStore:    cs,
 		paramsKeeper: pk,
 	}
 }

x/ecocredit/server/basket/keeper_test.go

@@ -68,7 +68,8 @@ func setupBase(t gocuke.TestingT) *baseSuite {
 	s.bankKeeper = mocks2.NewMockBankKeeper(s.ctrl)
 	s.distKeeper = mocks2.NewMockDistributionKeeper(s.ctrl)
 	s.paramsKeeper = mocks2.NewMockParamKeeper(s.ctrl)
-	s.k = basket.NewKeeper(s.db, s.bankKeeper, s.distKeeper, s.paramsKeeper)
+
+	s.k = basket.NewKeeper(s.stateStore, s.coreStore, s.bankKeeper, s.distKeeper, s.paramsKeeper)
 	s.coreStore, err = ecoApi.NewStateStore(s.db)
 	assert.NilError(t, err)
 	_, _, s.addr = testdata.KeyTestPubAddr()