fix: Make DatabaseTrieWitness stateful #15833
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cy00r
requested review from
rkrasiuk,
Rjected,
shekhirin,
rakita and
joshieDo
as code owners
Rjected
requested changes
Apr 22, 2025
Comment on lines
12
to
+13
| /// Create a new [`TrieWitness`] from database transaction. | ||
| fn from_tx(tx: &'a TX) -> Self; | ||
| fn from_tx(&self) -> Self; |
There was a problem hiding this comment.
I think we don't want this method on the trait any more
Comment on lines
+26
to
28
| fn from_tx(&self) -> Self { | ||
| Self::new(self.trie_cursor_factory.clone(), self.hashed_cursor_factory.clone()) | ||
| } |
There was a problem hiding this comment.
we should move this to be a method directly on TrieWitness, and we still want the argument to be &'a TX
Comment on lines
+30
to
+32
| pub trie_cursor_factory: T, | ||
| /// The factory for hashed cursors. | ||
| hashed_cursor_factory: H, | ||
| pub hashed_cursor_factory: H, |
Comment on lines
30
to
+43
| fn overlay_witness( | ||
| tx: &'a TX, | ||
| &self, | ||
| input: TrieInput, | ||
| target: HashedPostState, | ||
| ) -> Result<B256Map<Bytes>, TrieWitnessError> { | ||
| let nodes_sorted = input.nodes.into_sorted(); | ||
| let state_sorted = input.state.into_sorted(); | ||
| Self::from_tx(tx) | ||
| Self::from_tx(&self) | ||
| .with_trie_cursor_factory(InMemoryTrieCursorFactory::new( | ||
| DatabaseTrieCursorFactory::new(tx), | ||
| self.trie_cursor_factory.clone(), | ||
| &nodes_sorted, | ||
| )) | ||
| .with_hashed_cursor_factory(HashedPostStateCursorFactory::new( | ||
| DatabaseHashedCursorFactory::new(tx), | ||
| self.hashed_cursor_factory.clone(), |
There was a problem hiding this comment.
I think this actually motivates changing the &self, to be self in the trait, that way we could do something like:
self.
// with_trie_cursor_factory call
// with_hashed_cursor_factory call
// ...
.compute(target)
|
@cy00r are you still working on the PR / will you be able to work on the feedback? let us know if you want to hand it over |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes Make DatabaseTrieWitness stateful #15481