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

Add genesis and msgs check #2512

Merged
merged 1 commit into from
Jan 21, 2021
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
19 changes: 19 additions & 0 deletions modules/guardian/genesis.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package guardian

import (
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/irisnet/irishub/modules/guardian/keeper"
Expand All @@ -9,6 +11,9 @@ import (

// InitGenesis stores genesis data
func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data types.GenesisState) {
if err := ValidateGenesis(data); err != nil {
panic(fmt.Errorf("failed to initialize guardian genesis state: %s", err.Error()))
}
// Add supers
for _, super := range data.Supers {
keeper.AddSuper(ctx, super)
Expand All @@ -28,3 +33,17 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {

return types.NewGenesisState(supers)
}

// ValidateGenesis performs basic validation of supply genesis data returning an
// error for any failed validation criteria.
func ValidateGenesis(data types.GenesisState) error {
for _, super := range data.Supers {
if _, err := sdk.AccAddressFromBech32(super.Address); err != nil {
return err
}
if _, err := sdk.AccAddressFromBech32(super.AddedBy); err != nil {
return err
}
}
return nil
}
16 changes: 8 additions & 8 deletions modules/guardian/types/msgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ func (msg MsgAddSuper) ValidateBasic() error {
if len(msg.Description) == 0 {
return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "description missing")
}
if len(msg.Address) == 0 {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "added address missing")
if _, err := sdk.AccAddressFromBech32(msg.Address); err != nil {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid address (%s)", err)
}
if len(msg.AddedBy) == 0 {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "operator address missing")
if _, err := sdk.AccAddressFromBech32(msg.AddedBy); err != nil {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid operator address (%s)", err)
}
if err := msg.EnsureLength(); err != nil {
return err
Expand Down Expand Up @@ -92,11 +92,11 @@ func (msg MsgDeleteSuper) GetSignBytes() []byte {

// RoValidateBasicute implements Msg.
func (msg MsgDeleteSuper) ValidateBasic() error {
if len(msg.Address) == 0 {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "deleted address missing")
if _, err := sdk.AccAddressFromBech32(msg.Address); err != nil {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid address (%s)", err)
}
if len(msg.DeletedBy) == 0 {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "operator address missing")
if _, err := sdk.AccAddressFromBech32(msg.DeletedBy); err != nil {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid operator address (%s)", err)
}
return nil
}
Expand Down