Merge pull request #792 from oasisprotocol/pro-wh/feature/unbump

Revert "storage: bump consensus RegistryEvents cache key"
oasisprotocol · Oct 24, 2024 · 3a8f327 · 3a8f327
2 parents cd97658 + c2c81c5
commit 3a8f327
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 20 deletions.
diff --git a/.changelog/792.feature.md b/.changelog/792.feature.md
@@ -0,0 +1 @@
+Revert "storage: bump consensus RegistryEvents cache key"
diff --git a/storage/oasis/nodeapi/file/consensus.go b/storage/oasis/nodeapi/file/consensus.go
@@ -122,8 +122,7 @@ func (c *FileConsensusApiLite) GetEpoch(ctx context.Context, height int64) (beac
 func (c *FileConsensusApiLite) RegistryEvents(ctx context.Context, height int64) ([]nodeapi.Event, error) {
 	return kvstore.GetSliceFromCacheOrCall(
 		c.db, height == consensus.HeightLatest,
-		// v2: Renamed some event fields.
-		kvstore.GenerateCacheKey("RegistryEvents.v2", height),
+		kvstore.GenerateCacheKey("RegistryEvents", height),
 		func() ([]nodeapi.Event, error) { return c.consensusApi.RegistryEvents(ctx, height) },
 	)
 }

diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg b/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg.pmt
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/index.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/index.pmt
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/main.pix b/tests/e2e_regression/damask/rpc-cache/consensus/main.pix
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg b/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/index.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/index.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/main.pix b/tests/e2e_regression/eden/rpc-cache/consensus/main.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg b/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix b/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix