refactor(proto): remove macaroon proto

x/vault/depinject.go

@@ -14,7 +14,6 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 
 	modulev1 "github.com/onsonr/sonr/api/vault/module/v1"
 	didkeeper "github.com/onsonr/sonr/x/did/keeper"
@@ -45,7 +44,6 @@ type ModuleInputs struct {
 
 	AccountKeeper  authkeeper.AccountKeeper
 	DidKeeper      didkeeper.Keeper
-	MacaroonKeeper macaroonkeeper.Keeper
 	StakingKeeper  stakingkeeper.Keeper
 	SlashingKeeper slashingkeeper.Keeper
 }
@@ -60,7 +58,7 @@ 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.AccountKeeper, in.DidKeeper, in.MacaroonKeeper)
+	k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.AccountKeeper, in.DidKeeper)
 	m := NewAppModule(in.Cdc, k, in.DidKeeper)
 
 	return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}}

x/vault/keeper/keeper.go

@@ -17,7 +17,6 @@ import (
 	apiv1 "github.com/onsonr/sonr/api/vault/v1"
 	dwngen "github.com/onsonr/sonr/internal/dwn/gen"
 	didkeeper "github.com/onsonr/sonr/x/did/keeper"
-	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 	"github.com/onsonr/sonr/x/vault/types"
 )
 
@@ -36,9 +35,8 @@ type Keeper struct {
 	ipfsClient  *rpc.HttpApi
 	hasIpfsConn bool
 
-	AccountKeeper  authkeeper.AccountKeeper
-	DIDKeeper      didkeeper.Keeper
-	MacaroonKeeper macaroonkeeper.Keeper
+	AccountKeeper authkeeper.AccountKeeper
+	DIDKeeper     didkeeper.Keeper
 }
 
 // NewKeeper creates a new Keeper instance
@@ -49,7 +47,6 @@ func NewKeeper(
 	authority string,
 	authKeeper authkeeper.AccountKeeper,
 	didKeeper didkeeper.Keeper,
-	macaroonKeeper macaroonkeeper.Keeper,
 ) Keeper {
 	var hasIpfs bool
 	logger = logger.With(log.ModuleKey, "x/"+types.ModuleName)
@@ -80,13 +77,12 @@ func NewKeeper(
 	}
 
 	k := Keeper{
-		cdc:            cdc,
-		logger:         logger,
-		DIDKeeper:      didKeeper,
-		MacaroonKeeper: macaroonKeeper,
-		AccountKeeper:  authKeeper,
-		Params:         collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
-		OrmDB:          store,
+		cdc:           cdc,
+		logger:        logger,
+		DIDKeeper:     didKeeper,
+		AccountKeeper: authKeeper,
+		Params:        collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
+		OrmDB:         store,
 
 		ipfsClient:  ipfsClient,
 		hasIpfsConn: hasIpfs,

x/vault/keeper/keeper_test.go

@@ -24,7 +24,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/vault"
 	"github.com/onsonr/sonr/x/vault/keeper"
 	"github.com/onsonr/sonr/x/vault/types"
@@ -52,7 +51,6 @@ type testFixture struct {
 	stakingKeeper *stakingkeeper.Keeper
 	mintkeeper    mintkeeper.Keeper
 	didk          didkeeper.Keeper
-	mack          macaroonkeeper.Keeper
 
 	addrs      []sdk.AccAddress
 	govModAddr string
@@ -80,7 +78,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.accountkeeper, f.didk, f.mack)
+	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.accountkeeper, f.didk)
 	f.msgServer = keeper.NewMsgServerImpl(f.k)
 	f.queryServer = keeper.NewQuerier(f.k)
 	f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didk)