refactor(proto): remove macaroon proto

x/service/depinject.go

@@ -18,7 +18,6 @@ import (
 
 	modulev1 "github.com/onsonr/sonr/api/service/module/v1"
 	didkeeper "github.com/onsonr/sonr/x/did/keeper"
-	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 	"github.com/onsonr/sonr/x/service/keeper"
 	vaultkeeper "github.com/onsonr/sonr/x/vault/keeper"
 )
@@ -47,7 +46,6 @@ type ModuleInputs struct {
 
 	DidKeeper      didkeeper.Keeper
 	GroupKeeper    groupkeeper.Keeper
-	MacaroonKeeper macaroonkeeper.Keeper
 	NFTKeeper      nftkeeper.Keeper
 	StakingKeeper  stakingkeeper.Keeper
 	SlashingKeeper slashingkeeper.Keeper
@@ -64,8 +62,8 @@ type ModuleOutputs struct {
 func ProvideModule(in ModuleInputs) ModuleOutputs {
 	govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String()
 
-	k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.DidKeeper, in.GroupKeeper, in.MacaroonKeeper, in.NFTKeeper, in.VaultKeeper)
-	m := NewAppModule(in.Cdc, k, in.DidKeeper, in.MacaroonKeeper)
+	k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.DidKeeper, in.GroupKeeper, in.NFTKeeper, in.VaultKeeper)
+	m := NewAppModule(in.Cdc, k, in.DidKeeper)
 
 	return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}}
 }

x/service/keeper/keeper.go

@@ -13,7 +13,6 @@ import (
 
 	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"
 	vaultkeeper "github.com/onsonr/sonr/x/vault/keeper"
 )
@@ -30,11 +29,10 @@ type Keeper struct {
 
 	authority string
 
-	DidKeeper      didkeeper.Keeper
-	GroupKeeper    groupkeeper.Keeper
-	MacaroonKeeper macaroonkeeper.Keeper
-	NFTKeeper      nftkeeper.Keeper
-	VaultKeeper    vaultkeeper.Keeper
+	DidKeeper   didkeeper.Keeper
+	GroupKeeper groupkeeper.Keeper
+	NFTKeeper   nftkeeper.Keeper
+	VaultKeeper vaultkeeper.Keeper
 }
 
 // NewKeeper creates a new Keeper instance
@@ -45,7 +43,6 @@ func NewKeeper(
 	authority string,
 	didKeeper didkeeper.Keeper,
 	groupKeeper groupkeeper.Keeper,
-	macaroonKeeper macaroonkeeper.Keeper,
 	nftKeeper nftkeeper.Keeper,
 	vaultKeeper vaultkeeper.Keeper,
 ) Keeper {
@@ -76,10 +73,9 @@ func NewKeeper(
 
 		authority: authority,
 
-		DidKeeper:      didKeeper,
-		GroupKeeper:    groupKeeper,
-		MacaroonKeeper: macaroonKeeper,
-		NFTKeeper:      nftKeeper,
+		DidKeeper:   didKeeper,
+		GroupKeeper: groupKeeper,
+		NFTKeeper:   nftKeeper,
 	}
 
 	schema, err := sb.Build()

x/service/keeper/keeper_test.go

@@ -26,7 +26,6 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	didkeeper "github.com/onsonr/sonr/x/did/keeper"
-	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 	module "github.com/onsonr/sonr/x/service"
 	"github.com/onsonr/sonr/x/service/keeper"
 	"github.com/onsonr/sonr/x/service/types"
@@ -54,7 +53,6 @@ type testFixture struct {
 	bankkeeper    bankkeeper.BaseKeeper
 	didkeeper     didkeeper.Keeper
 	groupkeeper   groupkeeper.Keeper
-	mack          macaroonkeeper.Keeper
 	stakingKeeper *stakingkeeper.Keeper
 	mintkeeper    mintkeeper.Keeper
 	nftkeeper     nftkeeper.Keeper
@@ -86,10 +84,10 @@ 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.didkeeper, f.groupkeeper, f.mack, f.nftkeeper, f.vaultkeeper)
+	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.didkeeper, f.groupkeeper, f.nftkeeper, f.vaultkeeper)
 	f.msgServer = keeper.NewMsgServerImpl(f.k)
 	f.queryServer = keeper.NewQuerier(f.k)
-	f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didkeeper, f.mack)
+	f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didkeeper)
 
 	return f
 }

x/service/module.go

@@ -16,7 +16,6 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 
 	didkeeper "github.com/onsonr/sonr/x/did/keeper"
-	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 	"github.com/onsonr/sonr/x/service/keeper"
 	"github.com/onsonr/sonr/x/service/types"
 )
@@ -46,7 +45,6 @@ type AppModule struct {
 
 	keeper keeper.Keeper
 	didk   didkeeper.Keeper
-	mack   macaroonkeeper.Keeper
 }
 
 // NewAppModule constructor
@@ -54,13 +52,11 @@ func NewAppModule(
 	cdc codec.Codec,
 	keeper keeper.Keeper,
 	didkeeper didkeeper.Keeper,
-	macaroonkeeper macaroonkeeper.Keeper,
 ) *AppModule {
 	return &AppModule{
 		AppModuleBasic: AppModuleBasic{cdc: cdc},
 		keeper:         keeper,
 		didk:           didkeeper,
-		mack:           macaroonkeeper,
 	}
 }