improving tag handling for chain upgrade (#1287)

* improving tag handling for chain upgrade

* improving tag handling for chain upgrade

Author: avkr003

app/setup_handlers.go

@@ -42,15 +42,23 @@ func generateUpgradeVersion() string {
 		panic(fmt.Sprintf("Invalid version format: %s. Expected format: vX.Y.Z", currentVersion))
 	}
 	majorVersion := strings.TrimPrefix(parts[0], "v")
+	minorVersion := parts[1]
 	// required for testnet
 	patchParts := strings.Split(parts[2], "-")
 	rcVersion := ""
 	if len(patchParts) > 1 {
 		rcVersion = strings.Join(patchParts[1:], "-")
 	}
+	// testnet
 	if rcVersion != "" {
+		if minorVersion != "0" && minorVersion != "999999" {
+			return fmt.Sprintf("v%s.%s-%s", majorVersion, minorVersion, rcVersion)
+		}
 		return fmt.Sprintf("v%s-%s", majorVersion, rcVersion)
 	}
+	if minorVersion != "0" && minorVersion != "999999" {
+		return fmt.Sprintf("v%s.%s", majorVersion, parts[1])
+	}
 	return fmt.Sprintf("v%s", majorVersion)
 }
 

app/setup_handlers_test.go

@@ -0,0 +1,34 @@
+package app
+
+import (
+	"github.com/cosmos/cosmos-sdk/version"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestGenerateUpgradeVersion(t *testing.T) {
+	// mainnet
+	version.Version = "v4.0.0"
+	require.Equal(t, "v4", generateUpgradeVersion())
+
+	version.Version = "v4.1.0"
+	require.Equal(t, "v4.1", generateUpgradeVersion())
+
+	version.Version = "v4.2.1"
+	require.Equal(t, "v4.2", generateUpgradeVersion())
+
+	// SUT
+	version.Version = "v"
+	require.Equal(t, "v999999", generateUpgradeVersion())
+
+	// testnet
+	version.Version = "v4.0.0-rc0"
+	require.Equal(t, "v4-rc0", generateUpgradeVersion())
+
+	version.Version = "v4.1.0-rc1"
+	require.Equal(t, "v4.1-rc1", generateUpgradeVersion())
+
+	// devnet
+	version.Version = "v2e561b347baaad345e9a73f4cbfcdcbf3c958d20"
+	require.Equal(t, "v2e561b347baaad345e9a73f4cbfcdcbf3c958d20", generateUpgradeVersion())
+}