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

Feat : Trimmed label to prevent white spaces #1412

Merged
merged 6 commits into from
May 26, 2023
Merged

Feat : Trimmed label to prevent white spaces #1412

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c0b4b9
Merge pull request #1397 from CosmWasm/ext_wasmibctesting
ruthishvitwit May 16, 2023
892d175
Merge branch 'main' of https://github.com/ruthishvitwit/wasmd into main
ruthishvitwit May 19, 2023
f6f8eb3
Merge branch 'main' of https://github.com/CosmWasm/wasmd into main
ruthishvitwit May 19, 2023
00d5f7f
Feat : Trimmed label to prevent white spaces
ruthishvitwit May 19, 2023
8ca2d96
Fix: Made required nit changes
ruthishvitwit May 19, 2023
dd70f6d
Added test files to validate untrimmed labels
ruthishvitwit May 24, 2023
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
4 changes: 4 additions & 0 deletions x/wasm/types/proposal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ func (p InstantiateContractProposal) ValidateBasic() error {
if p.CodeID == 0 {
return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "code id is required")
}
//this code can be removed based on the preference between silent trimming the label or validating the label
ruthishvitwit marked this conversation as resolved.
Show resolved Hide resolved
if p.Label != strings.TrimSpace(p.Label) {
ruthishvitwit marked this conversation as resolved.
Show resolved Hide resolved
p.Label = strings.TrimSpace(p.Label)
}

if err := ValidateLabel(p.Label); err != nil {
return err
Expand Down
4 changes: 4 additions & 0 deletions x/wasm/types/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package types
import (
"fmt"
"net/url"
"strings"

errorsmod "cosmossdk.io/errors"
"github.com/docker/distribution/reference"
Expand Down Expand Up @@ -40,6 +41,9 @@ func ValidateLabel(label string) error {
if len(label) > MaxLabelSize {
return ErrLimit.Wrapf("cannot be longer than %d characters", MaxLabelSize)
}
if label != strings.TrimSpace(label) {
return ErrInvalid.Wrapf("'%s'This label is not trimmed", label)
ruthishvitwit marked this conversation as resolved.
Show resolved Hide resolved
}
return nil
}

Expand Down