Merge branch 'release/v1.19.x' into dwedul/bp-19-wasm

# Conflicts: # CHANGELOG.md
provenance-io · Jul 11, 2024 · 386e097 · 386e097
2 parents ec3ff05 + 9096c30
commit 386e097
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Improvements
+
+* Add the (empty) `umber-rc2` upgrade [#2069](https://github.com/provenance-io/provenance/pull/2069).
+
 ### Bug Fixes
 
 * Put the location of the wasm directory back to where it is in previous versions: data/wasm/wasm [#2071](https://github.com/provenance-io/provenance/pull/2071).

diff --git a/app/upgrades.go b/app/upgrades.go
@@ -56,7 +56,7 @@ type appUpgrade struct {
 // If something is happening in the rc upgrade(s) that isn't being applied in the non-rc,
 // or vice versa, please add comments explaining why in both entries.
 var upgrades = map[string]appUpgrade{
-	"umber-rc1": { // upgrade for v1.19.0-rc1
+	"umber-rc1": { // upgrade for v1.19.0-rc2
 		Added:   []string{crisistypes.ModuleName, circuittypes.ModuleName, consensusparamtypes.ModuleName},
 		Deleted: []string{"reward"},
 		Handler: func(ctx sdk.Context, app *App, vm module.VersionMap) (module.VersionMap, error) {
@@ -105,6 +105,7 @@ var upgrades = map[string]appUpgrade{
 			return vm, nil
 		},
 	},
+	"umber-rc2": {}, // upgrade for v1.19.0-rc3
 	"umber": { // upgrade for v1.19.0
 		Added:   []string{crisistypes.ModuleName, circuittypes.ModuleName, consensusparamtypes.ModuleName},
 		Deleted: []string{"reward"},

diff --git a/app/upgrades_test.go b/app/upgrades_test.go
@@ -402,6 +402,18 @@ func (s *UpgradeTestSuite) TestUmberRC1() {
 	s.AssertUpgradeHandlerLogs("umber-rc1", expInLog, nil)
 }
 
+func (s *UpgradeTestSuite) TestUmberRC2() {
+	key := "umber-rc2"
+	s.Assert().Contains(upgrades, key, "%q defined upgrades map", key)
+
+	entry := upgrades[key]
+	s.Assert().NotNil(entry, "%q entry in the upgrades map", key)
+	s.Assert().Empty(entry.Added, "%q.Added", key)
+	s.Assert().Empty(entry.Deleted, "%q.Deleted", key)
+	s.Assert().Empty(entry.Renamed, "%q.Renamed", key)
+	s.Assert().Nil(entry.Handler, "%q.Handler", key)
+}
+
 func (s *UpgradeTestSuite) TestUmber() {
 	expInLog := []string{
 		"INF Pruning expired consensus states for IBC.",