Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: (x/crisis) failing tests for legacy app #12536

Merged
merged 21 commits into from
Jul 12, 2022
Merged

fix: (x/crisis) failing tests for legacy app #12536

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
42e4fff
WIP: params
atheeshp Jul 7, 2022
4612c9f
add msg server tests
atheeshp Jul 8, 2022
2440838
review changes
atheeshp Jul 8, 2022
068a10a
add tests
atheeshp Jul 8, 2022
fe70097
Merge branch 'main' of github.com:cosmos/cosmos-sdk into ap/crisis_pa…
atheeshp Jul 8, 2022
c02ddc0
Merge branch 'main' of github.com:cosmos/cosmos-sdk into ap/crisis_pa…
atheeshp Jul 11, 2022
fe05ed8
review
atheeshp Jul 11, 2022
3dd14fe
fix tests
atheeshp Jul 11, 2022
3bd2428
fix tests
atheeshp Jul 11, 2022
3d4e042
review
atheeshp Jul 11, 2022
befbbc0
fix tests
atheeshp Jul 11, 2022
14c5909
add migrations
atheeshp Jul 11, 2022
959921d
review
atheeshp Jul 11, 2022
18059a9
review changes
atheeshp Jul 11, 2022
5b3aef4
- new line
atheeshp Jul 11, 2022
0efc5ba
fix build
atheeshp Jul 12, 2022
ef87a79
Merge branch 'main' of github.com:cosmos/cosmos-sdk into ap/crisis_pa…
atheeshp Jul 12, 2022
a4cb151
fix
atheeshp Jul 12, 2022
d5791e5
fix build legacy
atheeshp Jul 12, 2022
13dcb71
Merge branch 'main' into ap/crisis_params
atheeshp Jul 12, 2022
2fdbd9c
Merge branch 'main' into ap/crisis_params
mergify[bot] Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions simapp/app_legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func NewSimApp(
bApp.SetInterfaceRegistry(interfaceRegistry)

keys := sdk.NewKVStoreKeys(
authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, crisistypes.StoreKey,
minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
govtypes.StoreKey, paramstypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
evidencetypes.StoreKey, capabilitytypes.StoreKey,
Expand Down Expand Up @@ -272,9 +272,8 @@ func NewSimApp(
)

invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod))
app.CrisisKeeper = crisiskeeper.NewKeeper(
app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName,
)
app.CrisisKeeper = crisiskeeper.NewKeeper(appCodec, keys[crisistypes.StoreKey], invCheckPeriod,
app.BankKeeper, authtypes.FeeCollectorName, authtypes.NewModuleAddress(govtypes.ModuleName).String())

app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper)

Expand Down Expand Up @@ -356,7 +355,7 @@ func NewSimApp(
vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants),
crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),
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, nil, app.GetSubspace(minttypes.ModuleName)),
Expand Down