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]>
cosmos · Nov 7, 2024 · 22f72bd · 22f72bd
1 parent b9ecf44
commit 22f72bd
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 811 deletions.
diff --git a/.changelog/unreleased/improvements/2381-remove-governance-whitelisting.md b/.changelog/unreleased/improvements/2381-remove-governance-whitelisting.md
@@ -0,0 +1,2 @@
+- `[x/democracy/governance]` Removal of consumer governance whitelisting functionality
+  ([\#2381](https://github.com/cosmos/interchain-security/pull/2381))
diff --git a/.changelog/unreleased/state-breaking/2381-remove-governance-whitelisting.md b/.changelog/unreleased/state-breaking/2381-remove-governance-whitelisting.md
@@ -0,0 +1,2 @@
+- `[x/democracy/governance]` Removal of consumer governance whitelisting functionality
+  ([\#2381](https://github.com/cosmos/interchain-security/pull/2381))
diff --git a/app/consumer-democracy/ante/forbidden_proposals_ante.go b/app/consumer-democracy/ante/forbidden_proposals_ante.go
diff --git a/app/consumer-democracy/ante/forbidden_proposals_ante_test.go b/app/consumer-democracy/ante/forbidden_proposals_ante_test.go
diff --git a/app/consumer-democracy/ante_handler.go b/app/consumer-democracy/ante_handler.go
@@ -10,7 +10,6 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
-	democracyante "github.com/cosmos/interchain-security/v6/app/consumer-democracy/ante"
 	consumerante "github.com/cosmos/interchain-security/v6/app/consumer/ante"
 	ibcconsumerkeeper "github.com/cosmos/interchain-security/v6/x/ccv/consumer/keeper"
 )
@@ -45,7 +44,6 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		ante.NewExtensionOptionsDecorator(nil),
 		consumerante.NewMsgFilterDecorator(options.ConsumerKeeper),
 		consumerante.NewDisabledModulesDecorator("/cosmos.evidence", "/cosmos.slashing"),
-		democracyante.NewForbiddenProposalsDecorator(IsProposalWhitelisted, IsModuleWhiteList),
 		ante.NewValidateBasicDecorator(),
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(options.AccountKeeper),

diff --git a/app/consumer-democracy/app.go b/app/consumer-democracy/app.go
@@ -38,6 +38,7 @@ import (
 	"cosmossdk.io/x/feegrant"
 	feegrantkeeper "cosmossdk.io/x/feegrant/keeper"
 	feegrantmodule "cosmossdk.io/x/feegrant/module"
+
 	// add mint
 	"cosmossdk.io/x/upgrade"
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
@@ -114,7 +115,6 @@ import (
 	consumerkeeper "github.com/cosmos/interchain-security/v6/x/ccv/consumer/keeper"
 	consumertypes "github.com/cosmos/interchain-security/v6/x/ccv/consumer/types"
 	ccvdistr "github.com/cosmos/interchain-security/v6/x/ccv/democracy/distribution"
-	ccvgov "github.com/cosmos/interchain-security/v6/x/ccv/democracy/governance"
 	ccvstaking "github.com/cosmos/interchain-security/v6/x/ccv/democracy/staking"
 )
 
@@ -549,7 +549,7 @@ func New(
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
-		ccvgov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, IsProposalWhitelisted, app.GetSubspace(govtypes.ModuleName), IsModuleWhiteList),
+		gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)),
 		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.ConsumerKeeper, app.GetSubspace(slashingtypes.ModuleName), app.interfaceRegistry),
 		ccvdistr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, *app.StakingKeeper, authtypes.FeeCollectorName, app.GetSubspace(distrtypes.ModuleName)),

diff --git a/app/consumer-democracy/proposals_whitelisting.go b/app/consumer-democracy/proposals_whitelisting.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[x/democracy/governance]` Removal of consumer governance whitelisting functionality
		([\#2381](https://github.com/cosmos/interchain-security/pull/2381))