add stateDir property to fix CI

zeta-chain · Apr 29, 2024 · 72438ea · 72438ea
1 parent 41e4b31
commit 72438ea
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 24 deletions.
diff --git a/app/setup_handlers.go b/app/setup_handlers.go
@@ -34,18 +34,21 @@ func SetupHandlers(app *App) {
 	// add each store upgrade to this slice with a monotonically increasing index.
 	// you must use a index that is greater than any migration that has ever been run.
 	allStoreUpgrades := upgradeTracker{
-		{
-			idx: 1000,
-			upgrade: storetypes.StoreUpgrades{
-				Added: []string{authoritytypes.ModuleName},
+		upgrades: []upgradeTrackerItem{
+			{
+				idx: 1000,
+				upgrade: storetypes.StoreUpgrades{
+					Added: []string{authoritytypes.ModuleName},
+				},
 			},
-		},
-		{
-			idx: 2000,
-			upgrade: storetypes.StoreUpgrades{
-				Added: []string{lightclienttypes.ModuleName},
+			{
+				idx: 2000,
+				upgrade: storetypes.StoreUpgrades{
+					Added: []string{lightclienttypes.ModuleName},
+				},
 			},
 		},
+		stateFileDir: DefaultNodeHome,
 	}
 
 	// if this is a develop release, use the special develop store loader functionality
@@ -82,11 +85,14 @@ type upgradeTrackerItem struct {
 	upgrade storetypes.StoreUpgrades
 }
 
-type upgradeTracker []upgradeTrackerItem
+type upgradeTracker struct {
+	upgrades     []upgradeTrackerItem
+	stateFileDir string
+}
 
 func (t upgradeTracker) getDevelopStoreUpgrades() *storetypes.StoreUpgrades {
 	neededUpgrades := &storetypes.StoreUpgrades{}
-	stateFilePath := path.Join(DefaultNodeHome, "storeupgradetracker")
+	stateFilePath := path.Join(t.stateFileDir, "storeupgradetracker")
 
 	currentIdx := int64(0)
 	if stateFileContents, err := os.ReadFile(stateFilePath); err == nil {
@@ -99,7 +105,7 @@ func (t upgradeTracker) getDevelopStoreUpgrades() *storetypes.StoreUpgrades {
 	}
 
 	maxIdx := currentIdx
-	for _, item := range t {
+	for _, item := range t.upgrades {
 		idx := item.idx
 		upgrade := item.upgrade
 		if idx <= currentIdx {
@@ -110,7 +116,7 @@ func (t upgradeTracker) getDevelopStoreUpgrades() *storetypes.StoreUpgrades {
 		neededUpgrades.Renamed = append(neededUpgrades.Renamed, upgrade.Renamed...)
 		maxIdx = idx
 	}
-	err := os.WriteFile(stateFilePath, []byte(strconv.FormatInt(maxIdx, 10)), os.ModePerm)
+	err := os.WriteFile(stateFilePath, []byte(strconv.FormatInt(maxIdx, 10)), 0o660)
 	if err != nil {
 		panic(fmt.Sprintf("unable to write upgrade state file: %v", err))
 	}
@@ -131,7 +137,7 @@ func (t upgradeTracker) getDevelopStoreLoader() baseapp.StoreLoader {
 
 func (t upgradeTracker) mergeAllUpgrades() *storetypes.StoreUpgrades {
 	upgrades := &storetypes.StoreUpgrades{}
-	for _, item := range t {
+	for _, item := range t.upgrades {
 		upgrade := item.upgrade
 		upgrades.Added = append(upgrades.Added, upgrade.Added...)
 		upgrades.Deleted = append(upgrades.Deleted, upgrade.Deleted...)

diff --git a/app/setup_handlers_test.go b/app/setup_handlers_test.go
@@ -1,6 +1,7 @@
 package app
 
 import (
+	"os"
 	"testing"
 	"time"
 
@@ -16,19 +17,25 @@ func TestStoreUpgradeTracker(t *testing.T) {
 	// use timestamp for tracker idx so migrations work regardless of system state
 	now := time.Now().UnixMicro()
 
+	tmpdir, err := os.MkdirTemp("", "storeupgradetracker-*")
+	r.NoError(err)
+
 	allStoreUpgrades := upgradeTracker{
-		{
-			idx: now,
-			upgrade: storetypes.StoreUpgrades{
-				Added: []string{authoritytypes.ModuleName},
+		upgrades: []upgradeTrackerItem{
+			{
+				idx: 1000,
+				upgrade: storetypes.StoreUpgrades{
+					Added: []string{authoritytypes.ModuleName},
+				},
 			},
-		},
-		{
-			idx: now + 1,
-			upgrade: storetypes.StoreUpgrades{
-				Added: []string{lightclienttypes.ModuleName},
+			{
+				idx: 2000,
+				upgrade: storetypes.StoreUpgrades{
+					Added: []string{lightclienttypes.ModuleName},
+				},
 			},
 		},
+		stateFileDir: tmpdir,
 	}
 
 	r.Len(allStoreUpgrades.mergeAllUpgrades().Added, 2)
@@ -49,7 +56,7 @@ func TestStoreUpgradeTracker(t *testing.T) {
 
 	// now add a upgrade and ensure that it gets run without running
 	// the other upgrades
-	allStoreUpgrades = append(allStoreUpgrades, upgradeTrackerItem{
+	allStoreUpgrades.upgrades = append(allStoreUpgrades.upgrades, upgradeTrackerItem{
 		idx: now + 3,
 		upgrade: storetypes.StoreUpgrades{
 			Deleted: []string{"example"},