Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 33 additions & 12 deletions src/serve/grpc/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@ impl ChainStream {
domain: D,
intersect: Vec<ChainPoint>,
cancel: C,
) -> impl Stream<Item = TipEvent> + 'static {
async_stream::stream! {
let result = ChainCrawler::<D>::start(
&domain,
&intersect,
);

let start = result.expect("issue starting crawler");

let (mut crawler, intersected) = start.expect("crawler can't find start point");
) -> Result<Option<impl Stream<Item = TipEvent> + 'static>, DomainError> {
let Some((mut crawler, intersected)) = ChainCrawler::<D>::start(&domain, &intersect)?
else {
return Ok(None);
};

Ok(Some(async_stream::stream! {
yield TipEvent::Mark(intersected.clone());

while let Some((point, block)) = crawler.next_block() {
Expand All @@ -36,7 +32,7 @@ impl ChainStream {
}
}
}
}
}))
}
}

Expand Down Expand Up @@ -81,7 +77,9 @@ mod tests {
domain,
vec![chain_point.clone()],
CancelTokenImpl(CancellationToken::new()),
);
)
.unwrap()
.expect("intersect point should be found");

pin_mut!(s);

Expand All @@ -105,4 +103,27 @@ mod tests {

background.abort();
}

#[tokio::test]
async fn test_stream_unknown_intersect() {
let domain = ToyDomain::new(None, None);

for i in 0..=10 {
let (_, block) = make_conway_block(i * 10);

use dolos_core::SyncExt;
domain.roll_forward(block).unwrap();
}

// this point was never rolled forward, so the domain can't intersect it.
let unknown_point = make_conway_block(9999).0;

let result = ChainStream::start::<ToyDomain, CancelTokenImpl>(
domain,
vec![unknown_point],
CancelTokenImpl(CancellationToken::new()),
);

assert!(result.unwrap().is_none());
}
}
8 changes: 7 additions & 1 deletion src/serve/grpc/v1alpha/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,13 @@ where
self.domain.clone(),
intersect.clone(),
self.cancel.clone(),
);
)
.map_err(|e| Status::internal(format!("failed to start chain stream: {e}")))?
.ok_or_else(|| {
Status::not_found(format!(
"none of the requested points intersect with local history: {intersect:?}"
))
})?;

let mapper = self.mapper.clone();

Expand Down
8 changes: 7 additions & 1 deletion src/serve/grpc/v1alpha/watch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,13 @@ where
.collect::<Vec<ChainPoint>>();

let stream =
ChainStream::start::<D, _>(self.domain.clone(), intersect, self.cancel.clone());
ChainStream::start::<D, _>(self.domain.clone(), intersect.clone(), self.cancel.clone())
.map_err(|e| Status::internal(format!("failed to start chain stream: {e}")))?
.ok_or_else(|| {
Status::not_found(format!(
"none of the requested points intersect with local history: {intersect:?}"
))
})?;

let mapper = self.mapper.clone();

Expand Down
8 changes: 7 additions & 1 deletion src/serve/grpc/v1beta/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,13 @@ where
self.domain.clone(),
intersect.clone(),
self.cancel.clone(),
);
)
.map_err(|e| Status::internal(format!("failed to start chain stream: {e}")))?
.ok_or_else(|| {
Status::not_found(format!(
"none of the requested points intersect with local history: {intersect:?}"
))
})?;

let mapper = self.mapper.clone();

Expand Down
8 changes: 7 additions & 1 deletion src/serve/grpc/v1beta/watch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,13 @@ where
.collect::<Vec<ChainPoint>>();

let stream =
ChainStream::start::<D, _>(self.domain.clone(), intersect, self.cancel.clone());
ChainStream::start::<D, _>(self.domain.clone(), intersect.clone(), self.cancel.clone())
.map_err(|e| Status::internal(format!("failed to start chain stream: {e}")))?
.ok_or_else(|| {
Status::not_found(format!(
"none of the requested points intersect with local history: {intersect:?}"
))
})?;

let mapper = self.mapper.clone();

Expand Down
Loading