get_event is sued to query for the first empty response too

informalsystems · May 23, 2020 · 52b6ce4 · 52b6ce4
1 parent ff97e71
commit 52b6ce4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/tendermint/src/rpc/event_listener.rs b/tendermint/src/rpc/event_listener.rs
@@ -69,7 +69,7 @@ impl EventListener {
     }
 
     /// Get the next event from the websocket
-    pub async fn get_event(&mut self) -> Result<TMEventData, Box<dyn stdError>> {
+    pub async fn get_event(&mut self) -> Result<Option<TMEventData>, Box<dyn stdError>> {
         let msg = self
             .socket
             .next()
@@ -111,9 +111,9 @@ pub enum TMEventData {
 /// Event data from a subscription
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ResultEvent {
-    query: String,
-    data: TMEventData,
-    events: HashMap<String, Vec<String>>,
+    query: Option<String>,
+    data: Option<TMEventData>,
+    events: Option<HashMap<String, Vec<String>>>,
 }
 impl response::Response for ResultEvent {}
 

diff --git a/tendermint/tests/integration.rs b/tendermint/tests/integration.rs
@@ -160,7 +160,8 @@ mod rpc {
         // client.subscribe("tm.event='NewBlock'".to_owned()).await.unwrap();
 
         // Collect and throw away the response to subscribe
-        client.get_event().await.unwrap();
+        let empty = client.get_event().await.unwrap();
+        assert!(empty.is_none());
 
         // Loop here is helpful when debugging parsing of JSON events
         // loop{