diff --git a/.changelog/792.feature.md b/.changelog/792.feature.md new file mode 100644 index 000000000..c89250ea4 --- /dev/null +++ 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 index e26c5de35..82967e046 100644 --- 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 index 93538b7d0..2ef428262 100644 --- a/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg +++ b/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:235898ff9da197ba9c7593d7a35955bce52feb8b4a08123c3d2d83b694cfd7a9 -size 152979407 +oid sha256:9a4c6cf32b7d92fdba3808565a8cf2b51e5e9231ca35ce162bf9ca80c35d3765 +size 171213441 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 index 1d839125d..e2d781f03 100644 Binary files a/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg.pmt and b/tests/e2e_regression/damask/rpc-cache/consensus/00000-1.psg.pmt differ diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt index 2151dc782..fac9c521e 100644 Binary files a/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt and b/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt differ diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/index.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/index.pmt index 0bbc7f2bc..373e1498a 100644 Binary files a/tests/e2e_regression/damask/rpc-cache/consensus/index.pmt and b/tests/e2e_regression/damask/rpc-cache/consensus/index.pmt differ diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/main.pix b/tests/e2e_regression/damask/rpc-cache/consensus/main.pix index ffc8ed7ea..3b0d64773 100644 --- a/tests/e2e_regression/damask/rpc-cache/consensus/main.pix +++ b/tests/e2e_regression/damask/rpc-cache/consensus/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddbb238ef36caabfc7ea8702925ccf6674afdf0684ae1040014ab51ba587c4d9 -size 389632 +oid sha256:2b8de32a84ae3b18bf9e16d0b1de9c72c23fc27bdd9cc089389ead42024b98b8 +size 413184 diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix index 4c6957d5c..50ede9ec4 100644 --- a/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix +++ b/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d8a5de4c78e22c65b21182e78595c2b184d8e83777e1acc90f26c2fa8084a62 -size 69120 +oid sha256:443b4442ff40ec3dd7fa096306a9eacd948cb37bb352d03d67155c1ac98039ee +size 79872 diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg b/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg index 7877af0e1..11ced7c6f 100644 --- a/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg +++ b/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78ae512591ebfb18618b0b63c6536ac8993836cd4f0f1d7f8ca1287a2da7c0e4 -size 242509399 +oid sha256:a35efcfb157558134cb6294bd10c6e87580a0a6f24577e6597e7d337dbb93b89 +size 272678331 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 index fd09c1ff0..2441e35db 100644 Binary files a/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg.pmt and b/tests/e2e_regression/eden/rpc-cache/consensus/00000-1.psg.pmt differ diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt index 337a90181..c7523e26d 100644 Binary files a/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt and b/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt differ diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/index.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/index.pmt index c5358fcac..f62f7f84a 100644 Binary files a/tests/e2e_regression/eden/rpc-cache/consensus/index.pmt and b/tests/e2e_regression/eden/rpc-cache/consensus/index.pmt differ diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/main.pix b/tests/e2e_regression/eden/rpc-cache/consensus/main.pix index e10a17d03..de3d3e5da 100644 --- a/tests/e2e_regression/eden/rpc-cache/consensus/main.pix +++ b/tests/e2e_regression/eden/rpc-cache/consensus/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ddf3a7a72267046fe9a1cac5cb53e4d649597e27cff491305b88d89fb1bf16c -size 389632 +oid sha256:d33ce774031934bc273587746deb2bf8f11f8070ff3462d149c0a74a9063a146 +size 413184 diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix index d9d9bb4b7..ca0df5cca 100644 --- a/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix +++ b/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d4cdba222b73629aad025f2a93fe6573b64ebba97ca84fee633c604a3527b11 -size 73216 +oid sha256:5f31532c5f459c6ef720fa1261d17d0a171882363669bb044801310393e164b0 +size 76800 diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg b/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg index a1efc0b70..c09b42bf3 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg +++ b/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:826ad0dd6b124d27d5fe6ae12932613303159302afa07be9fa8104e3701c0d82 -size 238865351 +oid sha256:fa9e1e9cf627d9164a38feef0a29ae91e8b7b5b829256b295a8784069c17d04f +size 269041005 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 index 84416cbd2..5eb581e5a 100644 Binary files a/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg.pmt and b/tests/e2e_regression/edenfast/rpc-cache/consensus/00000-1.psg.pmt differ diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt index fe152594e..26d7801ad 100644 Binary files a/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt and b/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt differ diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt index bb20e5002..b7572d6aa 100644 Binary files a/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt and b/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt differ diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix b/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix index af09f6129..04162c6c8 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix +++ b/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:041a888515ba374ed5fefcb010697c6ffde3bf83b8e491537a4eb23166f157a5 -size 342528 +oid sha256:214c235ad089bf8582a720caae6fbb5fff60c213158094424359a67ecdfbc3d8 +size 366080 diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix index 892b57442..996380f6c 100644 --- a/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix +++ b/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7b593601b1a5b8c87a7388d34da484f7a90f1071a8c5e11831aff1dfe60e8da -size 47104 +oid sha256:6179c3424952edd19a6137e4dd21d99583be36089477aed33c05b35e4387168d +size 65536