Skip to content

Commit 22f72bd

Browse files
stana-miricgithub-actionsmpoke
authored
refactor!: remove democracy/governance whitelisting (#2381)
* remove governance whitelisting * tests fix * doc fix * Update testing documentation * Revert "doc fix" This reverts commit ea0b735. * Update testing documentation * added changelog * doc update * Update docs/docs/consumer-development/consumer-chain-governance.md Co-authored-by: Marius Poke <[email protected]> * cr fix - doc --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: Marius Poke <[email protected]>
1 parent b9ecf44 commit 22f72bd

File tree

17 files changed

+10
-811
lines changed

17 files changed

+10
-811
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- `[x/democracy/governance]` Removal of consumer governance whitelisting functionality
2+
([\#2381](https://github.com/cosmos/interchain-security/pull/2381))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- `[x/democracy/governance]` Removal of consumer governance whitelisting functionality
2+
([\#2381](https://github.com/cosmos/interchain-security/pull/2381))

app/consumer-democracy/ante/forbidden_proposals_ante.go

Lines changed: 0 additions & 57 deletions
This file was deleted.

app/consumer-democracy/ante/forbidden_proposals_ante_test.go

Lines changed: 0 additions & 169 deletions
This file was deleted.

app/consumer-democracy/ante_handler.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1111
"github.com/cosmos/cosmos-sdk/x/auth/ante"
1212

13-
democracyante "github.com/cosmos/interchain-security/v6/app/consumer-democracy/ante"
1413
consumerante "github.com/cosmos/interchain-security/v6/app/consumer/ante"
1514
ibcconsumerkeeper "github.com/cosmos/interchain-security/v6/x/ccv/consumer/keeper"
1615
)
@@ -45,7 +44,6 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
4544
ante.NewExtensionOptionsDecorator(nil),
4645
consumerante.NewMsgFilterDecorator(options.ConsumerKeeper),
4746
consumerante.NewDisabledModulesDecorator("/cosmos.evidence", "/cosmos.slashing"),
48-
democracyante.NewForbiddenProposalsDecorator(IsProposalWhitelisted, IsModuleWhiteList),
4947
ante.NewValidateBasicDecorator(),
5048
ante.NewTxTimeoutHeightDecorator(),
5149
ante.NewValidateMemoDecorator(options.AccountKeeper),

app/consumer-democracy/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
"cosmossdk.io/x/feegrant"
3939
feegrantkeeper "cosmossdk.io/x/feegrant/keeper"
4040
feegrantmodule "cosmossdk.io/x/feegrant/module"
41+
4142
// add mint
4243
"cosmossdk.io/x/upgrade"
4344
upgradekeeper "cosmossdk.io/x/upgrade/keeper"
@@ -114,7 +115,6 @@ import (
114115
consumerkeeper "github.com/cosmos/interchain-security/v6/x/ccv/consumer/keeper"
115116
consumertypes "github.com/cosmos/interchain-security/v6/x/ccv/consumer/types"
116117
ccvdistr "github.com/cosmos/interchain-security/v6/x/ccv/democracy/distribution"
117-
ccvgov "github.com/cosmos/interchain-security/v6/x/ccv/democracy/governance"
118118
ccvstaking "github.com/cosmos/interchain-security/v6/x/ccv/democracy/staking"
119119
)
120120

@@ -549,7 +549,7 @@ func New(
549549
capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
550550
crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),
551551
feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
552-
ccvgov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, IsProposalWhitelisted, app.GetSubspace(govtypes.ModuleName), IsModuleWhiteList),
552+
gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)),
553553
mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)),
554554
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.ConsumerKeeper, app.GetSubspace(slashingtypes.ModuleName), app.interfaceRegistry),
555555
ccvdistr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, *app.StakingKeeper, authtypes.FeeCollectorName, app.GetSubspace(distrtypes.ModuleName)),

app/consumer-democracy/proposals_whitelisting.go

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)