chore(trie): Stateful DatabaseTrieWitness
#16900
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
emhane
requested review from
rkrasiuk,
Rjected,
shekhirin and
rakita
as code owners
emhane
added
A-db
emhane
added
C-debt
Rjected
reviewed
Jun 26, 2025
There was a problem hiding this comment.
@Rjected do we still need/want this?
This would be nice, although the other PRs for this refactor had issues with cyclic deps that I think we should address with some reorganization first. One question about why this needs a FnOnce mainly, and another comment about removing generics from one of the new fns
Comment on lines
+58
to
70
| /// Applies given operation on and sets the trie cursor factory. | ||
| pub fn with_trie_cursor_factory<TF, F>(self, f: F) -> TrieWitness<TF, H> | ||
| where | ||
| F: FnOnce(T) -> TF, | ||
| { | ||
| TrieWitness { | ||
| trie_cursor_factory, | ||
| trie_cursor_factory: f(self.trie_cursor_factory), | ||
| hashed_cursor_factory: self.hashed_cursor_factory, | ||
| prefix_sets: self.prefix_sets, | ||
| always_include_root_node: self.always_include_root_node, | ||
| witness: self.witness, | ||
| } | ||
| } |
There was a problem hiding this comment.
why did we have to make this method into one that requires a FnOnce?
There was a problem hiding this comment.
see commit at HEAD^, uglier syntax
| /// Set the hashed cursor factory. | ||
| pub fn with_hashed_cursor_factory<HF>(self, hashed_cursor_factory: HF) -> TrieWitness<T, HF> { | ||
| /// Applies given operation on and sets the hashed cursor factory. | ||
| pub fn with_hashed_cursor_factory<HF, F>(self, f: F) -> TrieWitness<T, HF> |
Comment on lines
+110
to
+117
| /// Constructs a new instance from given database transaction. | ||
| pub fn from_tx<'a, TX>(tx: &'a TX) -> Self | ||
| where | ||
| T: From<&'a TX>, | ||
| H: From<&'a TX>, | ||
| { | ||
| Self::new(T::from(tx), H::from(tx)) | ||
| } |
There was a problem hiding this comment.
could we make this a method on TrieWitness<DatabaseTrieCursorFactory<..>, DatabaseHashedCursorFactory<..>> instead of making this fully generic with From?
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 #15481