rollback importer defer, bring pw.Close() to closure

store/commitment/store.go

@@ -413,6 +413,7 @@ loop:
 			if err != nil {
 				return snapshotstypes.SnapshotItem{}, fmt.Errorf("failed to import tree for version %d: %w", version, err)
 			}
+			defer importer.Close()
 
 		case *snapshotstypes.SnapshotItem_IAVL:
 			if importer == nil {
@@ -461,10 +462,6 @@ loop:
 		}
 	}
 
-	if err := importer.Close(); err != nil {
-		return snapshotstypes.SnapshotItem{}, fmt.Errorf("failed to close importer: %w", err)
-	}
-
 	return snapshotItem, c.LoadVersion(version)
 }
 

store/snapshots/store.go

@@ -179,13 +179,13 @@ func (s *Store) Load(height uint64, format uint32) (*types.Snapshot, <-chan io.R
 				if _, err := io.Copy(pw, chunk); err != nil {
 					return fmt.Errorf("failed to copy chunk %d: %w", i, err)
 				}
+				_ = pw.Close()
 				return nil
 			}()
 			if err != nil {
 				_ = pw.CloseWithError(err)
 				return
 			}
-			_ = pw.Close()
 		}
 	}()