v4.4.0 handler finalized (#501)

JackalLabs · Jan 6, 2025 · c489b77 · c489b77
2 parents 729f38c + 7838151
commit c489b77
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 17 deletions.
diff --git a/app/upgrades/v440/upgrade_test.go b/app/upgrades/v440/upgrade_test.go
@@ -2,15 +2,37 @@ package v440_test
 
 import (
 	"github.com/jackalLabs/canine-chain/v4/app/upgrades"
-	v410 "github.com/jackalLabs/canine-chain/v4/app/upgrades/v410"
+	v440 "github.com/jackalLabs/canine-chain/v4/app/upgrades/v440"
 	"github.com/jackalLabs/canine-chain/v4/x/storage/types"
 )
 
 func (suite *UpgradeTestKeeper) TestUpgrade() {
 	suite.SetupSuite()
 	setupMsgServer(suite)
 
-	err := upgrades.RecoverFiles(suite.ctx, suite.storageKeeper, v410.UpgradeData, 20000, "v4.1.0-test")
+	m := []byte("test_file")
+	o := "jkl123"
+	var s int64 = 1
+	suite.storageKeeper.SetFile(suite.ctx, types.UnifiedFile{
+		Merkle:        m,
+		Owner:         o,
+		Start:         s,
+		Expires:       10000,
+		FileSize:      100,
+		ProofInterval: 3600,
+		ProofType:     0,
+		Proofs:        make([]string, 0),
+		MaxProofs:     3,
+		Note:          "{}",
+	})
+
+	v440.BumpInterval(suite.ctx, suite.storageKeeper)
+
+	f, found := suite.storageKeeper.GetFile(suite.ctx, m, o, s)
+	suite.Require().True(found)
+	suite.Require().Equal(int64(7200), f.ProofInterval)
+
+	err := upgrades.RecoverFiles(suite.ctx, suite.storageKeeper, v440.UpgradeData, 20000, "v4.4.0-test")
 	suite.Require().NoError(err)
 
 	i := 0
@@ -25,5 +47,5 @@ func (suite *UpgradeTestKeeper) TestUpgrade() {
 		return false
 	})
 
-	suite.Require().Equal(25000, i)
+	suite.Require().Equal(25001, i)
 }
diff --git a/app/upgrades/v440/upgrades.go b/app/upgrades/v440/upgrades.go
@@ -39,28 +39,34 @@ func (u *Upgrade) Name() string {
 	return "v440"
 }
 
+func BumpInterval(ctx sdk.Context, sk *storageKeeper.Keeper) {
+	var newWindow int64 = 7200
+
+	storageParams := sk.GetParams(ctx)
+	var oldProofWindow int64 = 3600
+
+	storageParams.CheckWindow = 300
+	storageParams.ProofWindow = newWindow
+	sk.SetParams(ctx, storageParams)
+
+	files := sk.GetAllFileByMerkle(ctx)
+	for _, file := range files {
+		if file.ProofInterval == oldProofWindow { // updating default files to the new window
+			file.ProofInterval = newWindow
+			sk.SetFile(ctx, file)
+		}
+	}
+}
+
 // Handler implements upgrades.Upgrade
 func (u *Upgrade) Handler() upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-		var newWindow int64 = 7200
 		params := u.mk.GetParams(ctx)
 		params.TokensPerBlock = 3_830_000
 		u.mk.SetParams(ctx, params)
 
-		storageParams := u.sk.GetParams(ctx)
-		oldProofWindow := storageParams.ProofWindow
+		BumpInterval(ctx, u.sk)
 
-		storageParams.CheckWindow = 300
-		storageParams.ProofWindow = newWindow
-		u.sk.SetParams(ctx, storageParams)
-
-		files := u.sk.GetAllFileByMerkle(ctx)
-		for _, file := range files {
-			if file.ProofInterval == oldProofWindow { // updating default files to the new window
-				file.ProofInterval = newWindow
-				u.sk.SetFile(ctx, file)
-			}
-		}
 		err := upgrades.RecoverFiles(ctx, u.sk, UpgradeData, plan.Height, "v4.4.0")
 		if err != nil {
 			return nil, err