feature/dwn sw js (#1103)

- **feat(macaroon): add  and  to macaroon genesis**
- **refactor: move schema definitions to dedicated file**
- **feat: remove Session model**
- **refactor: move session middleware to internal package**

x/service/keeper/keeper.go

@@ -5,11 +5,14 @@ import (
 	storetypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/orm/model/ormdb"
+	nftkeeper "cosmossdk.io/x/nft/keeper"
 	"github.com/cosmos/cosmos-sdk/codec"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	apiv1 "github.com/onsonr/sonr/api/service/v1"
+	didkeeper "github.com/onsonr/sonr/x/did/keeper"
+	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 	"github.com/onsonr/sonr/x/service/types"
 )
 
@@ -24,6 +27,10 @@ type Keeper struct {
 	OrmDB  apiv1.StateStore
 
 	authority string
+
+	DidKeeper      didkeeper.Keeper
+	MacaroonKeeper macaroonkeeper.Keeper
+	NFTKeeper      nftkeeper.Keeper
 }
 
 // NewKeeper creates a new Keeper instance
@@ -32,6 +39,9 @@ func NewKeeper(
 	storeService storetypes.KVStoreService,
 	logger log.Logger,
 	authority string,
+	didKeeper didkeeper.Keeper,
+	macaroonKeeper macaroonkeeper.Keeper,
+	nftKeeper nftkeeper.Keeper,
 ) Keeper {
 	logger = logger.With(log.ModuleKey, "x/"+types.ModuleName)
 
@@ -59,6 +69,7 @@ func NewKeeper(
 		OrmDB:  store,
 
 		authority: authority,
+		NFTKeeper: nftKeeper,
 	}
 
 	schema, err := sb.Build()

x/service/keeper/keeper_test.go

@@ -6,6 +6,7 @@ import (
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
+	nftkeeper "cosmossdk.io/x/nft/keeper"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
@@ -53,6 +54,7 @@ type testFixture struct {
 	mack          macaroonkeeper.Keeper
 	stakingKeeper *stakingkeeper.Keeper
 	mintkeeper    mintkeeper.Keeper
+	nftkeeper     nftkeeper.Keeper
 
 	addrs      []sdk.AccAddress
 	govModAddr string
@@ -80,7 +82,7 @@ func SetupTest(t *testing.T) *testFixture {
 	registerBaseSDKModules(f, encCfg, storeService, logger, require)
 
 	// Setup Keeper.
-	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr)
+	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.didkeeper, f.mack, f.nftkeeper)
 	f.msgServer = keeper.NewMsgServerImpl(f.k)
 	f.queryServer = keeper.NewQuerier(f.k)
 	f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didkeeper, f.mack)