Skip to content

Commit 5a4b6d8

Browse files
committed
nit: validate MsgAssignConsumerKey
1 parent b5cebfa commit 5a4b6d8

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

x/ccv/provider/types/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var (
1111
ErrUnknownConsumerChainId = errorsmod.Register(ModuleName, 3, "no consumer chain with this chain id")
1212
ErrUnknownConsumerChannelId = errorsmod.Register(ModuleName, 4, "no consumer chain with this channel id")
1313
ErrInvalidConsumerConsensusPubKey = errorsmod.Register(ModuleName, 5, "empty consumer consensus public key")
14-
ErrBlankConsumerChainID = errorsmod.Register(ModuleName, 6, "consumer chain id must not be blank")
14+
ErrInvalidConsumerChainID = errorsmod.Register(ModuleName, 6, "invalid consumer chain id")
1515
ErrConsumerKeyNotFound = errorsmod.Register(ModuleName, 7, "consumer key not found")
1616
ErrNoValidatorConsumerAddress = errorsmod.Register(ModuleName, 8, "error getting validator consumer address")
1717
ErrNoValidatorProviderAddress = errorsmod.Register(ModuleName, 9, "error getting validator provider address")

x/ccv/provider/types/msg.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,13 @@ func (msg MsgAssignConsumerKey) GetSignBytes() []byte {
7272
// ValidateBasic implements the sdk.Msg interface.
7373
func (msg MsgAssignConsumerKey) ValidateBasic() error {
7474
if strings.TrimSpace(msg.ChainId) == "" {
75-
return ErrBlankConsumerChainID
75+
return errorsmod.Wrapf(ErrInvalidConsumerChainID, "chainId cannot be blank")
7676
}
7777
// It is possible to assign keys for consumer chains that are not yet approved.
7878
// This can only be done by a signing validator, but it is still sensible
7979
// to limit the chainID size to prevent abuse.
80-
8180
if 128 < len(msg.ChainId) {
82-
return ErrBlankConsumerChainID
81+
return errorsmod.Wrapf(ErrInvalidConsumerChainID, "chainId cannot exceed 128 length")
8382
}
8483
_, err := sdk.ValAddressFromBech32(msg.ProviderAddr)
8584
if err != nil {

0 commit comments

Comments
 (0)