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.

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

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

Merged
merged 6 commits into from
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Improvements

* (types) [#14163](https://github.com/cosmos/cosmos-sdk/pull/14163) Refactor `(coins Coins) Validate()` to avoid unnecessary map.
* (signing) [#14087](https://github.com/cosmos/cosmos-sdk/pull/14087) Add SignModeHandlerWithContext interface with a new `GetSignBytesWithContext` to get the sign bytes using `context.Context` as an argument to access state.
* (server) [#14062](https://github.com/cosmos/cosmos-sdk/pull/14062) Remove rosetta from server start.
* [13882] (https://github.com/cosmos/cosmos-sdk/pull/13882) Add tx `encode` and `decode` endpoints to amino tx service.
Expand Down
11 changes: 4 additions & 7 deletions types/coin.go
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
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