mirror of
https://github.com/onsonr/sonr.git
synced 2025-03-10 13:07:09 +00:00
feat(service): integrate group module (#1104)
This commit is contained in:
parent
ae56055640
commit
8ef7a7eab7
@ -137,5 +137,5 @@ announce:
|
|||||||
telegram:
|
telegram:
|
||||||
enabled: true
|
enabled: true
|
||||||
chat_id: -1002222617755
|
chat_id: -1002222617755
|
||||||
message_template: 'New Sonr Release {{.Tag}} is out{{ mdv2escape "!" }}'
|
message_template: "__*New Sonr Release*__ *{{.Tag}}* is out."
|
||||||
parse_mode: HTML
|
parse_mode: MarkdownV2
|
||||||
|
@ -663,6 +663,7 @@ func NewChainApp(
|
|||||||
logger,
|
logger,
|
||||||
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
|
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
|
||||||
app.DidKeeper,
|
app.DidKeeper,
|
||||||
|
app.GroupKeeper,
|
||||||
app.MacaroonKeeper,
|
app.MacaroonKeeper,
|
||||||
app.NFTKeeper,
|
app.NFTKeeper,
|
||||||
)
|
)
|
||||||
|
@ -12,6 +12,7 @@ import (
|
|||||||
"github.com/cosmos/cosmos-sdk/codec"
|
"github.com/cosmos/cosmos-sdk/codec"
|
||||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||||
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
|
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
|
||||||
|
groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
|
||||||
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
|
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
|
||||||
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
|
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
|
||||||
|
|
||||||
@ -44,6 +45,7 @@ type ModuleInputs struct {
|
|||||||
AddressCodec address.Codec
|
AddressCodec address.Codec
|
||||||
|
|
||||||
DidKeeper didkeeper.Keeper
|
DidKeeper didkeeper.Keeper
|
||||||
|
GroupKeeper groupkeeper.Keeper
|
||||||
MacaroonKeeper macaroonkeeper.Keeper
|
MacaroonKeeper macaroonkeeper.Keeper
|
||||||
NFTKeeper nftkeeper.Keeper
|
NFTKeeper nftkeeper.Keeper
|
||||||
StakingKeeper stakingkeeper.Keeper
|
StakingKeeper stakingkeeper.Keeper
|
||||||
@ -60,7 +62,7 @@ type ModuleOutputs struct {
|
|||||||
func ProvideModule(in ModuleInputs) ModuleOutputs {
|
func ProvideModule(in ModuleInputs) ModuleOutputs {
|
||||||
govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String()
|
govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String()
|
||||||
|
|
||||||
k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.DidKeeper, in.MacaroonKeeper, in.NFTKeeper)
|
k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.DidKeeper, in.GroupKeeper, in.MacaroonKeeper, in.NFTKeeper)
|
||||||
m := NewAppModule(in.Cdc, k, in.DidKeeper, in.MacaroonKeeper)
|
m := NewAppModule(in.Cdc, k, in.DidKeeper, in.MacaroonKeeper)
|
||||||
|
|
||||||
return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}}
|
return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}}
|
||||||
|
@ -9,6 +9,7 @@ import (
|
|||||||
"github.com/cosmos/cosmos-sdk/codec"
|
"github.com/cosmos/cosmos-sdk/codec"
|
||||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||||
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
|
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
|
||||||
|
groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
|
||||||
|
|
||||||
apiv1 "github.com/onsonr/sonr/api/service/v1"
|
apiv1 "github.com/onsonr/sonr/api/service/v1"
|
||||||
didkeeper "github.com/onsonr/sonr/x/did/keeper"
|
didkeeper "github.com/onsonr/sonr/x/did/keeper"
|
||||||
@ -29,6 +30,7 @@ type Keeper struct {
|
|||||||
authority string
|
authority string
|
||||||
|
|
||||||
DidKeeper didkeeper.Keeper
|
DidKeeper didkeeper.Keeper
|
||||||
|
GroupKeeper groupkeeper.Keeper
|
||||||
MacaroonKeeper macaroonkeeper.Keeper
|
MacaroonKeeper macaroonkeeper.Keeper
|
||||||
NFTKeeper nftkeeper.Keeper
|
NFTKeeper nftkeeper.Keeper
|
||||||
}
|
}
|
||||||
@ -40,6 +42,7 @@ func NewKeeper(
|
|||||||
logger log.Logger,
|
logger log.Logger,
|
||||||
authority string,
|
authority string,
|
||||||
didKeeper didkeeper.Keeper,
|
didKeeper didkeeper.Keeper,
|
||||||
|
groupKeeper groupkeeper.Keeper,
|
||||||
macaroonKeeper macaroonkeeper.Keeper,
|
macaroonKeeper macaroonkeeper.Keeper,
|
||||||
nftKeeper nftkeeper.Keeper,
|
nftKeeper nftkeeper.Keeper,
|
||||||
) Keeper {
|
) Keeper {
|
||||||
@ -69,7 +72,11 @@ func NewKeeper(
|
|||||||
OrmDB: store,
|
OrmDB: store,
|
||||||
|
|
||||||
authority: authority,
|
authority: authority,
|
||||||
NFTKeeper: nftKeeper,
|
|
||||||
|
DidKeeper: didKeeper,
|
||||||
|
GroupKeeper: groupKeeper,
|
||||||
|
MacaroonKeeper: macaroonKeeper,
|
||||||
|
NFTKeeper: nftKeeper,
|
||||||
}
|
}
|
||||||
|
|
||||||
schema, err := sb.Build()
|
schema, err := sb.Build()
|
||||||
|
@ -17,6 +17,7 @@ import (
|
|||||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||||
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
|
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
|
||||||
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
|
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
|
||||||
|
groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
|
||||||
mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
|
mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
|
||||||
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
|
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
|
||||||
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
|
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
|
||||||
@ -51,6 +52,7 @@ type testFixture struct {
|
|||||||
accountkeeper authkeeper.AccountKeeper
|
accountkeeper authkeeper.AccountKeeper
|
||||||
bankkeeper bankkeeper.BaseKeeper
|
bankkeeper bankkeeper.BaseKeeper
|
||||||
didkeeper didkeeper.Keeper
|
didkeeper didkeeper.Keeper
|
||||||
|
groupkeeper groupkeeper.Keeper
|
||||||
mack macaroonkeeper.Keeper
|
mack macaroonkeeper.Keeper
|
||||||
stakingKeeper *stakingkeeper.Keeper
|
stakingKeeper *stakingkeeper.Keeper
|
||||||
mintkeeper mintkeeper.Keeper
|
mintkeeper mintkeeper.Keeper
|
||||||
@ -82,7 +84,7 @@ func SetupTest(t *testing.T) *testFixture {
|
|||||||
registerBaseSDKModules(f, encCfg, storeService, logger, require)
|
registerBaseSDKModules(f, encCfg, storeService, logger, require)
|
||||||
|
|
||||||
// Setup Keeper.
|
// Setup Keeper.
|
||||||
f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.didkeeper, f.mack, f.nftkeeper)
|
f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.didkeeper, f.groupkeeper, f.mack, f.nftkeeper)
|
||||||
f.msgServer = keeper.NewMsgServerImpl(f.k)
|
f.msgServer = keeper.NewMsgServerImpl(f.k)
|
||||||
f.queryServer = keeper.NewQuerier(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, f.mack)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user