fix: revert double close fix (cosmos#15255)

agoric-labs · Sep 28, 2024 · 4e64b58 · 4e64b58
1 parent faf69eb
commit 4e64b58
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/store/rootmulti/snapshot_test.go b/store/rootmulti/snapshot_test.go
@@ -128,7 +128,7 @@ func TestMultistoreSnapshot_Checksum(t *testing.T) {
 			"aa048b4ee0f484965d7b3b06822cf0772cdcaad02f3b1b9055e69f2cb365ef3c",
 			"7921eaa3ed4921341e504d9308a9877986a879fe216a099c86e8db66fcba4c63",
 			"a4a864e6c02c9fca5837ec80dc84f650b25276ed7e4820cf7516ced9f9901b86",
-			"980925390cc50f14998ecb1e87de719ca9dd7e72f5fefbe445397bf670f36c31",
+			"8ca5b957e36fa13e704c31494649b2a74305148d70d70f0f26dee066b615c1d0",
 		}},
 	}
 	for _, tc := range testcases {

diff --git a/store/snapshots/helpers_test.go b/store/snapshots/helpers_test.go
@@ -78,6 +78,7 @@ func snapshotItems(items [][]byte, ext snapshottypes.ExtensionSnapshotter) [][]b
 			_ = snapshottypes.WriteExtensionPayload(protoWriter, item)
 		}
 		_ = protoWriter.Close()
+		_ = zWriter.Close()
 		_ = bufWriter.Flush()
 		_ = chunkWriter.Close()
 	}()

diff --git a/store/snapshots/manager_test.go b/store/snapshots/manager_test.go
@@ -98,7 +98,7 @@ func TestManager_Take(t *testing.T) {
 		Height: 5,
 		Format: snapshotter.SnapshotFormat(),
 		Chunks: 1,
-		Hash:   []uint8{0xcf, 0xd8, 0x16, 0xd2, 0xf8, 0x11, 0xe8, 0x90, 0x92, 0xf1, 0xfe, 0x3b, 0xea, 0xd2, 0x94, 0xfc, 0xfa, 0x4f, 0x9e, 0x2a, 0x91, 0xbe, 0xb0, 0x50, 0x83, 0xe9, 0x28, 0x62, 0x48, 0x6a, 0x4b, 0x4},
+		Hash:   []uint8{0x14, 0x38, 0x97, 0x96, 0xba, 0xe4, 0x81, 0xaf, 0x6c, 0xac, 0xff, 0xa5, 0xb8, 0x7e, 0x63, 0x4b, 0xac, 0x69, 0x3f, 0x38, 0x90, 0x5c, 0x7d, 0x57, 0xb3, 0xf, 0x69, 0x73, 0xb3, 0xa0, 0xe0, 0xad},
 		Metadata: types.Metadata{
 			ChunkHashes: checksums(expectChunks),
 		},

diff --git a/store/snapshots/types/format.go b/store/snapshots/types/format.go
@@ -3,4 +3,4 @@ package types
 // CurrentFormat is the currently used format for snapshots. Snapshots using the same format
 // must be identical across all nodes for a given height, so this must be bumped when the binary
 // snapshot output changes.
-const CurrentFormat uint32 = 3
+const CurrentFormat uint32 = 2
diff --git a/store/v2/snapshots/stream.go b/store/v2/snapshots/stream.go
@@ -64,6 +64,10 @@ func (sw *StreamWriter) Close() error {
 		sw.chunkWriter.CloseWithError(err)
 		return err
 	}
+	if err := sw.zWriter.Close(); err != nil {
+		sw.chunkWriter.CloseWithError(err)
+		return err
+	}
 	if err := sw.bufWriter.Flush(); err != nil {
 		sw.chunkWriter.CloseWithError(err)
 		return err