smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-26 00:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Kava-Labs/kava into linters

Browse Source
This commit is contained in:
Federico Kunze 2020-04-30 10:31:20 -04:00
commit 9743f356be
No known key found for this signature in database
GPG Key ID: 655F93A970080A30
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.go
View File

@ -401,6 +401,7 @@ func NewApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool,
bep3.NewAppModule(app.bep3Keeper, app.accountKeeper, app.supplyKeeper), bep3.NewAppModule(app.bep3Keeper, app.accountKeeper, app.supplyKeeper),
kavadist.NewAppModule(app.kavadistKeeper, app.supplyKeeper), kavadist.NewAppModule(app.kavadistKeeper, app.supplyKeeper),
incentive.NewAppModule(app.incentiveKeeper, app.accountKeeper, app.supplyKeeper), incentive.NewAppModule(app.incentiveKeeper, app.accountKeeper, app.supplyKeeper),
committee.NewAppModule(app.committeeKeeper, app.accountKeeper),
) )
app.sm.RegisterStoreDecoders() app.sm.RegisterStoreDecoders()

2
x/committee/keeper/proposal_test.go
View File

@ -289,7 +289,7 @@ func (suite *KeeperTestSuite) TestValidatePubProposal() {
[]params.ParamChange{{ []params.ParamChange{{
Subspace: cdptypes.ModuleName, Subspace: cdptypes.ModuleName,
Key: string(cdptypes.KeyGlobalDebtLimit), Key: string(cdptypes.KeyGlobalDebtLimit),
Value: string(types.ModuleCdc.MustMarshalJSON(cs(c("usdx", 100000000000)))), Value: string(types.ModuleCdc.MustMarshalJSON(c("usdx", 100000000000))),
}}, }},
), ),
expectErr: false, expectErr: false,