LaconicNetwork/cosmos-sdk
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore(x/upgrade): Use ValidateBasic for Plan in ReadUpgradeInfoFromDisk (#18210)

Browse Source
This commit is contained in:
Facundo Medica 2023-10-24 10:23:18 +02:00 committed by GitHub
parent c1f050ffd6
commit 458dd044b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x/upgrade/keeper/keeper.go
View File

@ -529,6 +529,10 @@ func (k Keeper) ReadUpgradeInfoFromDisk() (types.Plan, error) {
return upgradeInfo, err
}
if err := upgradeInfo.ValidateBasic(); err != nil {
return upgradeInfo, err
}
return upgradeInfo, nil
}

6
x/upgrade/keeper/keeper_test.go
View File

@ -99,6 +99,12 @@ func (s *KeeperTestSuite) TestReadUpgradeInfoFromDisk() {
s.Require().NoError(err)
expected.Height = 101
s.Require().Equal(expected, ui)
// create invalid upgrade plan (with empty name)
expected.Name = ""
s.Require().NoError(s.upgradeKeeper.DumpUpgradeInfoToDisk(101, expected))
_, err = s.upgradeKeeper.ReadUpgradeInfoFromDisk()
s.Require().ErrorContains(err, "name cannot be empty: invalid request")
}
func (s *KeeperTestSuite) TestScheduleUpgrade() {

4
x/upgrade/keeper/msg_server.go
View File

@ -32,10 +32,6 @@ func (k msgServer) SoftwareUpgrade(ctx context.Context, msg *types.MsgSoftwareUp
return nil, errors.Wrapf(types.ErrInvalidSigner, "expected %s got %s", k.authority, msg.Authority)
}
if err := msg.Plan.ValidateBasic(); err != nil {
return nil, errors.Wrap(err, "plan")
}
err := k.ScheduleUpgrade(ctx, msg.Plan)
if err != nil {
return nil, err