add review comments

Author: zhangchiqing

cmd/util/cmd/rollback-executed-height/cmd/rollback_executed_height.go

@@ -111,15 +111,10 @@ func runE(*cobra.Command, []string) error {
 
 		// remove chunk data packs first, because otherwise the index to find chunk data pack will be removed.
 		if len(chunkIDs) > 0 {
-			chunkDataPackIDs, err := chunkDataPacks.BatchRemove(chunkIDs, protocolDBBatch)
+			_, err := chunkDataPacks.BatchRemove(chunkIDs, protocolDBBatch)
 			if err != nil {
 				return fmt.Errorf("could not remove chunk data packs at %v: %w", flagHeight, err)
 			}
-
-			err = storedChunkDataPacks.Remove(chunkDataPackIDs)
-			if err != nil {
-				return fmt.Errorf("could not commit chunk batch at %v: %w", flagHeight, err)
-			}
 		}
 
 		err = protocolDBBatch.Commit()
@@ -143,8 +138,11 @@ func runE(*cobra.Command, []string) error {
 	})
 }
 
-// use badger instances directly instead of stroage interfaces so that the interface don't
-// need to include the Remove methods
+// removeExecutionResultsFromHeight removes all execution results and related data
+// from the specified block height onward to roll back the protocol state.
+// It returns the chunk IDs removed from the protocol state DB,
+// which can then be used to delete the corresponding chunk data packs from chunk
+// data pack database.
 func removeExecutionResultsFromHeight(
 	protocolDBBatch storage.Batch,
 	protoState protocol.State,

engine/execution/state/state.go

@@ -419,7 +419,7 @@ func (s *state) saveExecutionResults(
 	// in the protocol database (signifying the node's slashable commitment to the respective result) is
 	// done by the functor returned by `Store`. The functor's is invoked as part of the atomic batch update
 	// of the protocol database below.
-	storeFunc, err := s.chunkDataPacks.Store(chunks)
+	storeChunkDataPacksFunc, err := s.chunkDataPacks.Store(chunks)
 	if err != nil {
 		return fmt.Errorf("can not store chunk data packs for block ID: %v: %w", blockID, err)
 	}
@@ -446,7 +446,7 @@ func (s *state) saveExecutionResults(
 		return s.db.WithReaderBatchWriter(func(batch storage.ReaderBatchWriter) error {
 			// store the ChunkID -> StoredChunkDataPack.ID() mapping
 			// in s.db (protocol database along with other execution data in a single batch)
-			err := storeFunc(lctx, batch)
+			err := storeChunkDataPacksFunc(lctx, batch)
 			if err != nil {
 				return fmt.Errorf("cannot store chunk data packs: %w", err)
 			}