* refactor: Simplify SimulationManager setup (#12153)
(cherry picked from commit 544afb65e2
)
# Conflicts:
# CHANGELOG.md
# simapp/app.go
* fix conflict
* fix conflict
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
parent
008d10da40
commit
d721a760d8
|
@ -42,6 +42,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||||
* (x/feegrant) [\#11813](https://github.com/cosmos/cosmos-sdk/pull/11813) Fix pagination total count in `AllowancesByGranter` query.
|
* (x/feegrant) [\#11813](https://github.com/cosmos/cosmos-sdk/pull/11813) Fix pagination total count in `AllowancesByGranter` query.
|
||||||
* (errors) [\#12002](https://github.com/cosmos/cosmos-sdk/pull/12002) Removed 'redacted' error message from defaultErrEncoder.
|
* (errors) [\#12002](https://github.com/cosmos/cosmos-sdk/pull/12002) Removed 'redacted' error message from defaultErrEncoder.
|
||||||
* (ante) [#12017](https://github.com/cosmos/cosmos-sdk/pull/12017) Index ante events for failed tx (backport #12013).
|
* (ante) [#12017](https://github.com/cosmos/cosmos-sdk/pull/12017) Index ante events for failed tx (backport #12013).
|
||||||
|
* [#12153](https://github.com/cosmos/cosmos-sdk/pull/12153) Add a new `NewSimulationManagerFromAppModules` constructor, to simplify simulation wiring.
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
|
|
|
@ -373,20 +373,10 @@ func NewSimApp(
|
||||||
//
|
//
|
||||||
// NOTE: this is not required apps that don't use the simulator for fuzz testing
|
// NOTE: this is not required apps that don't use the simulator for fuzz testing
|
||||||
// transactions
|
// transactions
|
||||||
app.sm = module.NewSimulationManager(
|
overrideModules := map[string]module.AppModuleSimulation{
|
||||||
auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts),
|
authtypes.ModuleName: auth.NewAppModule(app.appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts),
|
||||||
bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
|
}
|
||||||
capability.NewAppModule(appCodec, *app.CapabilityKeeper),
|
app.sm = module.NewSimulationManagerFromAppModules(app.mm.Modules, overrideModules)
|
||||||
feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
|
|
||||||
gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
|
|
||||||
mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
|
|
||||||
staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
|
|
||||||
distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
|
|
||||||
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
|
|
||||||
params.NewAppModule(app.ParamsKeeper),
|
|
||||||
evidence.NewAppModule(app.EvidenceKeeper),
|
|
||||||
authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
|
|
||||||
)
|
|
||||||
|
|
||||||
app.sm.RegisterStoreDecoders()
|
app.sm.RegisterStoreDecoders()
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"math/rand"
|
"math/rand"
|
||||||
|
"sort"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/codec"
|
"github.com/cosmos/cosmos-sdk/codec"
|
||||||
|
@ -47,6 +48,38 @@ func NewSimulationManager(modules ...AppModuleSimulation) *SimulationManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewSimulationManagerFromAppModules creates a new SimulationManager object.
|
||||||
|
//
|
||||||
|
// First it sets any SimulationModule provided by overrideModules, and ignores any AppModule
|
||||||
|
// with the same moduleName.
|
||||||
|
// Then it attempts to cast every provided AppModule into an AppModuleSimulation.
|
||||||
|
// If the cast succeeds, its included, otherwise it is excluded.
|
||||||
|
func NewSimulationManagerFromAppModules(modules map[string]AppModule, overrideModules map[string]AppModuleSimulation) *SimulationManager {
|
||||||
|
simModules := []AppModuleSimulation{}
|
||||||
|
appModuleNamesSorted := make([]string, 0, len(modules))
|
||||||
|
for moduleName := range modules {
|
||||||
|
appModuleNamesSorted = append(appModuleNamesSorted, moduleName)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Strings(appModuleNamesSorted)
|
||||||
|
|
||||||
|
for _, moduleName := range appModuleNamesSorted {
|
||||||
|
// for every module, see if we override it. If so, use override.
|
||||||
|
// Else, if we can cast the app module into a simulation module add it.
|
||||||
|
// otherwise no simulation module.
|
||||||
|
if simModule, ok := overrideModules[moduleName]; ok {
|
||||||
|
simModules = append(simModules, simModule)
|
||||||
|
} else {
|
||||||
|
appModule := modules[moduleName]
|
||||||
|
if simModule, ok := appModule.(AppModuleSimulation); ok {
|
||||||
|
simModules = append(simModules, simModule)
|
||||||
|
}
|
||||||
|
// cannot cast, so we continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return NewSimulationManager(simModules...)
|
||||||
|
}
|
||||||
|
|
||||||
// GetProposalContents returns each module's proposal content generator function
|
// GetProposalContents returns each module's proposal content generator function
|
||||||
// with their default operation weight and key.
|
// with their default operation weight and key.
|
||||||
func (sm *SimulationManager) GetProposalContents(simState SimulationState) []simulation.WeightedProposalContent {
|
func (sm *SimulationManager) GetProposalContents(simState SimulationState) []simulation.WeightedProposalContent {
|
||||||
|
|
Loading…
Reference in New Issue