chore(x/upgrade): Use ValidateBasic for Plan in ReadUpgradeInfoFromDi…

…sk (backport #18210) (#18230) Co-authored-by: Facundo Medica <[email protected]> Co-authored-by: Julien Robert <[email protected]>
cosmos · Oct 24, 2023 · 98a8bfe · 98a8bfe
1 parent 269a245
commit 98a8bfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go
@@ -444,6 +444,10 @@ func (k Keeper) ReadUpgradeInfoFromDisk() (types.Plan, error) {
 		return upgradeInfo, err
 	}
 
+	if err := upgradeInfo.ValidateBasic(); err != nil {
+		return upgradeInfo, err
+	}
+
 	return upgradeInfo, nil
 }
 

diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go
@@ -84,6 +84,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() {