LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor(x/distribution): rm a dependency on x/gov (#16576)

Browse Source
This commit is contained in:
Matt Kocubinski 2023-06-16 15:16:19 -05:00 committed by GitHub
parent 1be7d9805e
commit f51992d0c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x/distribution/types/errors.go
View File

@ -16,4 +16,5 @@ var (
ErrEmptyProposalRecipient = errors.Register(ModuleName, 11, "invalid community pool spend proposal recipient")
ErrNoValidatorExists = errors.Register(ModuleName, 12, "validator does not exist")
ErrNoDelegationExists = errors.Register(ModuleName, 13, "delegation does not exist")
ErrInvalidProposalContent = errors.Register(ModuleName, 14, "invalid proposal content")
)

33
x/distribution/types/proposal.go
View File

@ -1,7 +1,9 @@
package types
import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
"strings"
errorsmod "cosmossdk.io/errors"
)
// GetTitle returns the title of a community pool spend proposal.
@ -18,7 +20,7 @@ func (csp *CommunityPoolSpendProposal) ProposalType() string { return "Community
// ValidateBasic runs basic stateless validity checks
func (csp *CommunityPoolSpendProposal) ValidateBasic() error {
err := govtypes.ValidateAbstract(csp)
err := validateAbstract(csp)
if err != nil {
return err
}
@ -31,3 +33,30 @@ func (csp *CommunityPoolSpendProposal) ValidateBasic() error {
return nil
}
// validateAbstract is semantically duplicated from x/gov/types/v1beta1/proposal.go to avoid a cyclic dependency
// between these two modules, x/distribution and x/gov.
// See: https://github.com/cosmos/cosmos-sdk/blob/4a6a1e3cb8de459891cb0495052589673d14ef51/x/gov/types/v1beta1/proposal.go#L196-L214
func validateAbstract(c *CommunityPoolSpendProposal) error {
const (
MaxTitleLength = 140
MaxDescriptionLength = 10000
)
title := c.GetTitle()
if len(strings.TrimSpace(title)) == 0 {
return errorsmod.Wrap(ErrInvalidProposalContent, "proposal title cannot be blank")
}
if len(title) > MaxTitleLength {
return errorsmod.Wrapf(ErrInvalidProposalContent, "proposal title is longer than max length of %d", MaxTitleLength)
}
description := c.GetDescription()
if len(description) == 0 {
return errorsmod.Wrap(ErrInvalidProposalContent, "proposal description cannot be blank")
}
if len(description) > MaxDescriptionLength {
return errorsmod.Wrapf(ErrInvalidProposalContent, "proposal description is longer than max length of %d", MaxDescriptionLength)
}
return nil
}