chore(gov): remove community spend proposal (#13)

Closes #11

CHANGELOG.md

@@ -16,5 +16,7 @@
   ([#4](https://github.com/atomone-hub/govgen/pull/4)).
 * Removed ability for validators to vote on proposals
   ([#10](https://github.com/atomone-hub/govgen/pull/10)).
+* Remove community spend proposal
+  ([#13](https://github.com/atomone-hub/govgen/pull/13)).
 
 ### STATE BREAKING

app/keepers/keepers.go

@@ -1,9 +1,10 @@
 package keepers
 
 import (
+	tmos "github.com/tendermint/tendermint/libs/os"
+
 	govkeeper "github.com/atomone-hub/govgen/v1/x/gov/keeper"
 	govtypes "github.com/atomone-hub/govgen/v1/x/gov/types"
-	tmos "github.com/tendermint/tendermint/libs/os"
 
 	// unnamed import of statik for swagger UI support
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
@@ -22,7 +23,6 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
-	distr "github.com/cosmos/cosmos-sdk/x/distribution"
 	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper"
@@ -208,7 +208,6 @@ func NewAppKeeper(
 	govRouter.
 		AddRoute(govtypes.RouterKey, govtypes.ProposalHandler).
 		AddRoute(paramproposal.RouterKey, govtypes.WrapSDKHandler(params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper))).
-		AddRoute(distrtypes.RouterKey, govtypes.WrapSDKHandler(distr.NewCommunityPoolSpendProposalHandler(appKeepers.DistrKeeper))).
 		AddRoute(upgradetypes.RouterKey, govtypes.WrapSDKHandler(upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper)))
 
 	/*

app/modules.go

@@ -20,7 +20,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
-	distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	"github.com/cosmos/cosmos-sdk/x/evidence"
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
@@ -64,7 +63,6 @@ var ModuleBasics = module.NewBasicManager(
 	distr.AppModuleBasic{},
 	gov.NewAppModuleBasic(
 		paramsclient.ProposalHandler,
-		distrclient.ProposalHandler,
 		upgradeclient.ProposalHandler,
 		upgradeclient.CancelProposalHandler,
 	),

app/sim/sim_utils.go

@@ -5,16 +5,18 @@ import (
 	"fmt"
 	"os"
 
-	govgen "github.com/atomone-hub/govgen/v1/app"
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
+	govgen "github.com/atomone-hub/govgen/v1/app"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/kv"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+	distrsim "github.com/cosmos/cosmos-sdk/x/distribution/simulation"
 )
 
 // SetupSimulation creates the config, db (levelDB), temporary directory and logger for
@@ -70,6 +72,13 @@ func SimulationOperations(app *govgen.GovGenApp, cdc codec.JSONCodec, config sim
 
 	simState.ParamChanges = app.SimulationManager().GenerateParamChanges(config.Seed)
 	simState.Contents = app.SimulationManager().GetProposalContents(simState)
+	// Remove disabled community spend proposal
+	for i := 0; i < len(simState.Contents); i++ {
+		if simState.Contents[i].AppParamsKey() == distrsim.OpWeightSubmitCommunitySpendProposal {
+			simState.Contents = append(simState.Contents[:i], simState.Contents[i+1:]...)
+			break
+		}
+	}
 	return app.SimulationManager().WeightedOperations(simState)
 }
 

x/gov/types/codec.go

@@ -6,7 +6,6 @@ import (
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
-	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	paramsproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
@@ -41,10 +40,6 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 		(*Content)(nil),
 		&paramsproposal.ParameterChangeProposal{},
 	)
-	registry.RegisterImplementations(
-		(*Content)(nil),
-		&distrtypes.CommunityPoolSpendProposal{},
-	)
 	registry.RegisterImplementations(
 		(*Content)(nil),
 		&upgradetypes.SoftwareUpgradeProposal{},
@@ -85,8 +80,6 @@ func init() {
 
 	// Register proposal types (this is actually done in related modules, but
 	// since we are using an other gov module, we need to do it manually).
-	RegisterProposalType(distrtypes.ProposalTypeCommunityPoolSpend)
-	RegisterProposalTypeCodec(&distrtypes.CommunityPoolSpendProposal{}, "cosmos-sdk/CommunityPoolSpendProposal")
 	RegisterProposalType(paramsproposal.ProposalTypeChange)
 	RegisterProposalTypeCodec(&paramsproposal.ParameterChangeProposal{}, "cosmos-sdk/ParameterChangeProposal")
 	RegisterProposalType(upgradetypes.ProposalTypeSoftwareUpgrade)