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

Jump to bottom

perf: Refactor Coins/Validate to avoid unnecessary map #14163

Merged
merged 6 commits into from
Dec 6, 2022
Merged

perf: Refactor Coins/Validate to avoid unnecessary map #14163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ff3324
Refactor (coins Coins) Validate() to avoid unnecessary map
webmaster128 Dec 5, 2022
a0d3245
Merge branch 'main' into remove-seen-map
tac0turtle Dec 6, 2022
1928394
Merge branch 'main' into remove-seen-map
julienrbrt Dec 6, 2022
00d1636
Merge branch 'main' into remove-seen-map
alexanderbez Dec 6, 2022
7e98b5d
Merge branch 'main' into remove-seen-map
tac0turtle Dec 6, 2022
d735f45
Add CHANGELOG entry
webmaster128 Dec 6, 2022
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
11 changes: 4 additions & 7 deletions types/coin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,26 +247,23 @@ func (coins Coins) Validate() error {
}

lowDenom := coins[0].Denom
seenDenoms := make(map[string]bool)
seenDenoms[lowDenom] = true

for _, coin := range coins[1:] {
if seenDenoms[coin.Denom] {
return fmt.Errorf("duplicate denomination %s", coin.Denom)
}
if err := ValidateDenom(coin.Denom); err != nil {
return err
}
if coin.Denom <= lowDenom {
if coin.Denom < lowDenom {
return fmt.Errorf("denomination %s is not sorted", coin.Denom)
}
if coin.Denom == lowDenom {
return fmt.Errorf("duplicate denomination %s", coin.Denom)
}
if !coin.IsPositive() {
return fmt.Errorf("coin %s amount is not positive", coin.Denom)
}

// we compare each coin against the last denom
lowDenom = coin.Denom
seenDenoms[coin.Denom] = true
}

return nil
Expand Down
29 changes: 28 additions & 1 deletion types/coin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,15 @@ func (s *coinTestSuite) TestCoins_Validate() {
},
false,
},
{
"bad sort (3)",
sdk.Coins{
{"gas", math.OneInt()},
{"tree", math.OneInt()},
{"gas", math.OneInt()},
},
false,
},
{
"non-positive amount (1)",
sdk.Coins{
Expand All @@ -797,14 +806,32 @@ func (s *coinTestSuite) TestCoins_Validate() {
false,
},
{
"duplicate denomination",
"duplicate denomination (1)",
sdk.Coins{
{"gas", math.OneInt()},
{"gas", math.OneInt()},
{"mineral", math.OneInt()},
},
false,
},
{
"duplicate denomination (2)",
sdk.Coins{
{"gold", math.OneInt()},
{"gold", math.OneInt()},
},
false,
},
{
"duplicate denomination (3)",
sdk.Coins{
{"gas", math.OneInt()},
{"mineral", math.OneInt()},
{"silver", math.OneInt()},
{"silver", math.OneInt()},
},
false,
},
}

for _, tc := range testCases {
Expand Down