Skip to content

feat(optimism): Decode text messages in WsFlashBlockStream #18257

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
mattsse merged 1 commit into from
Sep 4, 2025
Merged

feat(optimism): Decode text messages in WsFlashBlockStream #18257

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
11 changes: 8 additions & 3 deletions crates/optimism/flashblocks/src/ws/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ where
Ok(Message::Binary(bytes)) => {
return Poll::Ready(Some(FlashBlock::decode(bytes)))
}
Ok(Message::Text(bytes)) => {
return Poll::Ready(Some(FlashBlock::decode(bytes.into())))
}
Ok(Message::Ping(bytes)) => this.ping(bytes),
Ok(msg) => debug!("Received unexpected message: {:?}", msg),
Err(err) => return Poll::Ready(Some(Err(err.into()))),
Expand Down Expand Up @@ -222,7 +225,7 @@ mod tests {
use alloy_primitives::bytes::Bytes;
use brotli::enc::BrotliEncoderParams;
use std::{future, iter};
use tokio_tungstenite::tungstenite::{Error, Utf8Bytes};
use tokio_tungstenite::tungstenite::{protocol::frame::Frame, Error};

/// A `FakeConnector` creates [`FakeStream`].
///
Expand Down Expand Up @@ -438,9 +441,11 @@ mod tests {
assert_eq!(actual_messages, expected_messages);
}

#[test_case::test_case(Message::Pong(Bytes::from(b"test".as_slice())); "pong")]
#[test_case::test_case(Message::Frame(Frame::pong(b"test".as_slice())); "frame")]
#[tokio::test]
async fn test_stream_ignores_non_binary_message() {
let messages = FakeConnector::from([Ok(Message::Text(Utf8Bytes::from("test")))]);
async fn test_stream_ignores_unexpected_message(message: Message) {
let messages = FakeConnector::from([Ok(message)]);
let ws_url = "http://localhost".parse().unwrap();
let mut stream = WsFlashBlockStream::with_connector(ws_url, messages);
assert!(stream.next().await.is_none());
Expand Down