refactor: keep batch.Close error handle logic consistance

cosmos · Sep 20, 2024 · 80dda92 · 80dda92
1 parent 465ca23
commit 80dda92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
@@ -1147,7 +1147,9 @@ func (rs *Store) flushMetadata(db corestore.KVStoreWithBatch, version int64, cIn
 	rs.logger.Debug("flushing metadata", "height", version)
 	batch := db.NewBatch()
 	defer func() {
-		_ = batch.Close()
+		if err := batch.Close(); err != nil {
+			rs.logger.Error("error on batch close", "err", err)
+		}
 	}()
 
 	if cInfo != nil {

diff --git a/store/v2/commitment/metadata.go b/store/v2/commitment/metadata.go
@@ -158,8 +158,9 @@ func (m *MetadataStore) deleteRemovedStoreKeys(version uint64, removeStore func(
 
 	batch := m.kv.NewBatch()
 	defer func() {
-		if berr := batch.Close(); berr != nil {
-			err = berr
+		cErr := batch.Close()
+		if err == nil {
+			err = cErr
 		}
 	}()
 	for _, storeKey := range removedStoreKeys {