Skip to content

chore(trie): return OpProofsStorageError from unwind_history #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emhane merged 1 commit into from
Jan 6, 2026
Merged

chore(trie): return OpProofsStorageError from unwind_history #548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions crates/optimism/trie/src/live.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ where

/// Remove account, storage and trie updates from historical storage for all blocks from
/// the specified block (inclusive).
pub async fn unwind_history(&self, to: BlockWithParent) -> eyre::Result<()> {
self.storage.unwind_history(to).await?;
Ok(())
pub async fn unwind_history(&self, to: BlockWithParent) -> Result<(), OpProofsStorageError> {
self.storage.unwind_history(to).await
Comment on lines +227 to +228
Copy link

Copilot AI Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR title mentions returning OpProofsStorageError from unwind_and_store_block_updates, but this change is actually applied to unwind_history. The unwind_and_store_block_updates method (line 180-223) still returns eyre::Result<()> which is inconsistent with other methods in this implementation (like execute_and_store_block_updates and store_block_updates) that return Result<(), OpProofsStorageError>.

Consider updating unwind_and_store_block_updates to also return Result<(), OpProofsStorageError> for consistency, or update the PR title to accurately reflect that only unwind_history is being changed.

Copilot uses AI. Check for mistakes.
}
}
Loading