improve error handle on try_stream!

movementlabsxyz · Aug 20, 2024 · 98995e2 · 98995e2
1 parent d4c8c76
commit 98995e2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/protocol-units/bridge/chains/movement/src/event_monitoring.rs b/protocol-units/bridge/chains/movement/src/event_monitoring.rs
@@ -47,9 +47,13 @@ impl Stream for MovementCounterpartyMonitoring<MovementAddress, MovementHash> {
 	>;
 
 	fn poll_next(self: Pin<&mut Self>, cx: &mut std::task::Context) -> Poll<Option<Self::Item>> {
-		let client = self.client.as_ref().unwrap(); // would be nice if poll_next could return Result
-		let rest_client = client.rest_client();
+		let client = if let Some(client) = self.client.as_ref() {
+			client
+		} else {
+			return Poll::Ready(None);
+		};
 
+		let rest_client = client.rest_client();
 		let stream = try_stream! {
 			loop {
 				let struct_tag = format!(