feat: add x/group app wiring integration tests (#12243)
## Description ref: #12024 --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
parent
d705a8bc8f
commit
bfb91ab7bc
@ -45,6 +45,7 @@ type App struct {
|
||||
beginBlockers []func(sdk.Context, abci.RequestBeginBlock)
|
||||
endBlockers []func(sdk.Context, abci.RequestEndBlock) []abci.ValidatorUpdate
|
||||
baseAppOptions []BaseAppOption
|
||||
msgServiceRouter *baseapp.MsgServiceRouter
|
||||
}
|
||||
|
||||
// RegisterModules registers the provided modules with the module manager and
|
||||
|
||||
@ -29,7 +29,6 @@ func (a *AppBuilder) Build(
|
||||
logger log.Logger,
|
||||
db dbm.DB,
|
||||
traceStore io.Writer,
|
||||
msgServiceRouter *baseapp.MsgServiceRouter,
|
||||
baseAppOptions ...func(*baseapp.BaseApp),
|
||||
) *App {
|
||||
for _, option := range a.app.baseAppOptions {
|
||||
@ -37,7 +36,7 @@ func (a *AppBuilder) Build(
|
||||
}
|
||||
|
||||
bApp := baseapp.NewBaseApp(a.app.config.AppName, logger, db, nil, baseAppOptions...)
|
||||
bApp.SetMsgServiceRouter(msgServiceRouter)
|
||||
bApp.SetMsgServiceRouter(a.app.msgServiceRouter)
|
||||
bApp.SetCommitMultiStoreTracer(traceStore)
|
||||
bApp.SetVersion(version.Version)
|
||||
bApp.SetInterfaceRegistry(a.app.interfaceRegistry)
|
||||
|
||||
@ -3,6 +3,8 @@ package runtime
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
|
||||
runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1"
|
||||
"cosmossdk.io/core/appmodule"
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
@ -12,7 +14,6 @@ import (
|
||||
"github.com/cosmos/cosmos-sdk/std"
|
||||
storetypes "github.com/cosmos/cosmos-sdk/store/types"
|
||||
"github.com/cosmos/cosmos-sdk/types/module"
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
)
|
||||
|
||||
// BaseAppOption is a depinject.AutoGroupType which can be used to pass
|
||||
@ -62,15 +63,17 @@ func provideCodecs(moduleBasics map[string]AppModuleBasicWrapper) (
|
||||
std.RegisterLegacyAminoCodec(amino)
|
||||
|
||||
cdc := codec.NewProtoCodec(interfaceRegistry)
|
||||
msgServiceRouter := baseapp.NewMsgServiceRouter()
|
||||
app := &App{
|
||||
storeKeys: nil,
|
||||
interfaceRegistry: interfaceRegistry,
|
||||
cdc: cdc,
|
||||
amino: amino,
|
||||
basicManager: basicManager,
|
||||
msgServiceRouter: msgServiceRouter,
|
||||
}
|
||||
|
||||
return interfaceRegistry, cdc, amino, app, cdc, baseapp.NewMsgServiceRouter()
|
||||
return interfaceRegistry, cdc, amino, app, cdc, msgServiceRouter
|
||||
}
|
||||
|
||||
type appInputs struct {
|
||||
|
||||
@ -210,7 +210,6 @@ func NewSimApp(
|
||||
}
|
||||
|
||||
var appBuilder *runtime.AppBuilder
|
||||
var msgServiceRouter *baseapp.MsgServiceRouter
|
||||
|
||||
if err := depinject.Inject(AppConfig,
|
||||
&appBuilder,
|
||||
@ -229,12 +228,11 @@ func NewSimApp(
|
||||
&app.SlashingKeeper,
|
||||
&app.MintKeeper,
|
||||
&app.EvidenceKeeper,
|
||||
&msgServiceRouter,
|
||||
); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
app.App = appBuilder.Build(logger, db, traceStore, msgServiceRouter, baseAppOptions...)
|
||||
app.App = appBuilder.Build(logger, db, traceStore, baseAppOptions...)
|
||||
|
||||
app.keys = sdk.NewKVStoreKeys(
|
||||
distrtypes.StoreKey,
|
||||
|
||||
@ -25,6 +25,7 @@ import (
|
||||
"google.golang.org/grpc"
|
||||
|
||||
"cosmossdk.io/math"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
"github.com/cosmos/cosmos-sdk/client"
|
||||
"github.com/cosmos/cosmos-sdk/client/tx"
|
||||
@ -135,35 +136,37 @@ func DefaultConfigWithAppConfig(appConfig depinject.Config) (Config, error) {
|
||||
|
||||
var (
|
||||
appBuilder *runtime.AppBuilder
|
||||
msgServiceRouter *baseapp.MsgServiceRouter
|
||||
txConfig client.TxConfig
|
||||
legacyAmino *codec.LegacyAmino
|
||||
codec codec.Codec
|
||||
cdc codec.Codec
|
||||
interfaceRegistry codectypes.InterfaceRegistry
|
||||
)
|
||||
|
||||
if err := depinject.Inject(appConfig,
|
||||
&appBuilder,
|
||||
&msgServiceRouter,
|
||||
&txConfig,
|
||||
&codec,
|
||||
&cdc,
|
||||
&legacyAmino,
|
||||
&interfaceRegistry,
|
||||
); err != nil {
|
||||
return Config{}, err
|
||||
}
|
||||
|
||||
cfg.Codec = codec
|
||||
cfg.Codec = cdc
|
||||
cfg.TxConfig = txConfig
|
||||
cfg.LegacyAmino = legacyAmino
|
||||
cfg.InterfaceRegistry = interfaceRegistry
|
||||
cfg.GenesisState = appBuilder.DefaultGenesis()
|
||||
cfg.AppConstructor = func(val Validator) servertypes.Application {
|
||||
// we build a unique app instance for every validator here
|
||||
var appBuilder *runtime.AppBuilder
|
||||
if err := depinject.Inject(appConfig, &appBuilder); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
app := appBuilder.Build(
|
||||
val.Ctx.Logger,
|
||||
dbm.NewMemDB(),
|
||||
nil,
|
||||
msgServiceRouter,
|
||||
baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.AppConfig.Pruning)),
|
||||
baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices),
|
||||
)
|
||||
|
||||
@ -13,7 +13,6 @@ import (
|
||||
tmtypes "github.com/tendermint/tendermint/types"
|
||||
dbm "github.com/tendermint/tm-db"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
||||
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
|
||||
@ -54,17 +53,16 @@ func Setup(appConfig depinject.Config, extraOutputs ...interface{}) (*runtime.Ap
|
||||
// create app
|
||||
//
|
||||
var appBuilder *runtime.AppBuilder
|
||||
var msgServiceRouter *baseapp.MsgServiceRouter
|
||||
var codec codec.Codec
|
||||
|
||||
if err := depinject.Inject(
|
||||
appConfig,
|
||||
append(extraOutputs, &appBuilder, &msgServiceRouter, &codec)...,
|
||||
append(extraOutputs, &appBuilder, &codec)...,
|
||||
); err != nil {
|
||||
return nil, fmt.Errorf("failed to inject dependencies: %w", err)
|
||||
}
|
||||
|
||||
app := appBuilder.Build(log.NewNopLogger(), dbm.NewMemDB(), nil, msgServiceRouter)
|
||||
app := appBuilder.Build(log.NewNopLogger(), dbm.NewMemDB(), nil)
|
||||
if err := app.Load(true); err != nil {
|
||||
return nil, fmt.Errorf("failed to load app: %w", err)
|
||||
}
|
||||
|
||||
@ -7,12 +7,15 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/testutil/network"
|
||||
"github.com/cosmos/cosmos-sdk/x/group/testutil"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/stretchr/testify/suite"
|
||||
)
|
||||
|
||||
func TestIntegrationTestSuite(t *testing.T) {
|
||||
cfg := network.DefaultConfig()
|
||||
cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig)
|
||||
require.NoError(t, err)
|
||||
cfg.NumValidators = 2
|
||||
suite.Run(t, NewIntegrationTestSuite(cfg))
|
||||
}
|
||||
|
||||
49
x/group/testutil/app.yaml
Normal file
49
x/group/testutil/app.yaml
Normal file
@ -0,0 +1,49 @@
|
||||
modules:
|
||||
- name: runtime
|
||||
config:
|
||||
"@type": cosmos.app.runtime.v1alpha1.Module
|
||||
|
||||
app_name: GroupApp
|
||||
|
||||
begin_blockers: [staking, auth, bank, genutil, authz, group, params]
|
||||
end_blockers: [staking, auth, bank, genutil, authz, group, params]
|
||||
init_genesis: [auth, bank, staking, genutil, authz, group, params]
|
||||
|
||||
- name: auth
|
||||
config:
|
||||
"@type": cosmos.auth.module.v1.Module
|
||||
bech32_prefix: cosmos
|
||||
module_account_permissions:
|
||||
- account: fee_collector
|
||||
- account: bonded_tokens_pool
|
||||
permissions: [burner, staking]
|
||||
- account: not_bonded_tokens_pool
|
||||
permissions: [burner, staking]
|
||||
|
||||
- name: bank
|
||||
config:
|
||||
"@type": cosmos.bank.module.v1.Module
|
||||
|
||||
- name: params
|
||||
config:
|
||||
"@type": cosmos.params.module.v1.Module
|
||||
|
||||
- name: tx
|
||||
config:
|
||||
"@type": cosmos.tx.module.v1.Module
|
||||
|
||||
- name: staking
|
||||
config:
|
||||
"@type": cosmos.staking.module.v1.Module
|
||||
|
||||
- name: authz
|
||||
config:
|
||||
"@type": cosmos.authz.module.v1.Module
|
||||
|
||||
- name: group
|
||||
config:
|
||||
"@type": cosmos.group.v1.module.v1.Module
|
||||
|
||||
- name: genutil
|
||||
config:
|
||||
"@type": cosmos.genutil.module.v1.Module
|
||||
20
x/group/testutil/app_config.go
Normal file
20
x/group/testutil/app_config.go
Normal file
@ -0,0 +1,20 @@
|
||||
package testutil
|
||||
|
||||
import (
|
||||
_ "embed"
|
||||
|
||||
"cosmossdk.io/core/appconfig"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/auth"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/auth/tx/module"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/authz"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/bank"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/genutil"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/group"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/params"
|
||||
_ "github.com/cosmos/cosmos-sdk/x/staking"
|
||||
)
|
||||
|
||||
//go:embed app.yaml
|
||||
var appConfig []byte
|
||||
|
||||
var AppConfig = appconfig.LoadYAML(appConfig)
|
||||
Loading…
Reference in New Issue
Block a user