Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

R4R: Add custom validation for denom #6755

Merged
merged 13 commits into from
Oct 6, 2020
Merged

R4R: Add custom validation for denom #6755

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a9d8b52
Add custom validation for denom
okwme Jul 17, 2020
cc9c9a1
Merge branch 'master' into okwme/6744-custom-denom-validation
alexanderbez Jul 17, 2020
151b5cf
Merge branch 'master' into okwme/6744-custom-denom-validation
Jul 17, 2020
8457171
make validation a function
okwme Oct 3, 2020
162374d
Merge branch 'okwme/6744-custom-denom-validation' of https://github.c…
okwme Oct 3, 2020
6b45ca5
Merge branch 'master' into okwme/6744-custom-denom-validation
okwme Oct 3, 2020
6d60d2a
reset default regex
okwme Oct 4, 2020
eb8df16
Merge branch 'okwme/6744-custom-denom-validation' of https://github.c…
okwme Oct 4, 2020
ccb84d2
update CHANGELOG
okwme Oct 4, 2020
81a943e
update test format
okwme Oct 5, 2020
127f92a
Merge branch 'master' into okwme/6744-custom-denom-validation
okwme Oct 5, 2020
274cd0e
Merge branch 'master' into okwme/6744-custom-denom-validation
okwme Oct 6, 2020
93fd790
Merge branch 'master' into okwme/6744-custom-denom-validation
okwme Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions types/coin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,15 +589,18 @@ var (
reDecCoin = regexp.MustCompile(fmt.Sprintf(`^(%s)%s(%s)$`, reDecAmt, reSpc, reDnmString))
)

// ValidateDenom validates a denomination string returning an error if it is
// invalid.
func ValidateDenom(denom string) error {
// DefaultValidateDenom is the default validation function for Coin.Denom.
func DefaultValidateDenom(denom string) error {
if !reDnm.MatchString(denom) {
return fmt.Errorf("invalid denom: %s", denom)
}
return nil
}

// ValidateDenom validates a denomination string returning an error if it is
// invalid.
var ValidateDenom = DefaultValidateDenom

func mustValidateDenom(denom string) {
if err := ValidateDenom(denom); err != nil {
panic(err)
Expand Down