feat: add helper stream type for finalized notifications #14111
Conversation
This file contains 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
mattsse
requested changes
Jan 30, 2025
mattsse
approved these changes
Feb 4, 2025
mattsse
requested changes
Feb 5, 2025
| #[pin] | ||
| canon_stream: CanonStateNotificationStream<N>, | ||
| #[pin] | ||
| finalized_stream: ForkChoiceStream<SealedHeader<alloy_consensus::Header>>, |
There was a problem hiding this comment.
we need to replace the concrete header types with
Suggested change
| finalized_stream: ForkChoiceStream<SealedHeader<alloy_consensus::Header>>, | |
| finalized_stream: ForkChoiceStream<SealedHeaderFor<N>>, |
Comment on lines
+233
to
+244
| fn try_match( | ||
| buffered_notification: &Option<CanonStateNotification<N>>, | ||
| buffered_finalization: &Option<SealedHeader<alloy_consensus::Header>>, | ||
| ) -> Option<CanonStateNotification<N>> { | ||
| match (buffered_notification, buffered_finalization) { | ||
| (Some(notification), Some(finalized_header)) | ||
| if notification.tip().hash() == finalized_header.hash() => | ||
| { | ||
| Some(notification.clone()) | ||
| } | ||
| _ => None, | ||
| } |
There was a problem hiding this comment.
I'd like to inline this function so that we can .take the notification instead.
so we can move this inside the poll fn
| Poll::Ready(None) => return Poll::Ready(None), | ||
| Poll::Pending => {} | ||
| } | ||
|
|
There was a problem hiding this comment.
let's add a check here that breaks if one Option is none
|
|
||
| // Check if we have a matching pair using the projected fields | ||
| if let Some(notification) = | ||
| Self::try_match(this.buffered_notification, this.buffered_finalization) |
There was a problem hiding this comment.
this check can be simplified by checking
buffered.as_ref.map(|n|n.tip) == header.as_ref.map() {
header.take();
return buffered.take()
}
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 #14063