From bc2b6419dda1478144712e7b2efcbc1801d90fe0 Mon Sep 17 00:00:00 2001
From: Richard Pringle <richard.pringle@avalabs.org>
Date: Wed, 18 Oct 2023 14:08:11 -0400
Subject: [PATCH] Execute websocket test assertions

The assertions were not doing anthing before, they were only queued to
run
---
 crates/net/src/websocket/futures.rs | 49 +++++++++++++----------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/crates/net/src/websocket/futures.rs b/crates/net/src/websocket/futures.rs
index 9a65d638..7e87c466 100644
--- a/crates/net/src/websocket/futures.rs
+++ b/crates/net/src/websocket/futures.rs
@@ -354,43 +354,38 @@ impl PinnedDrop for WebSocket {
 mod tests {
     use super::*;
     use futures::{SinkExt, StreamExt};
-    use wasm_bindgen_futures::spawn_local;
     use wasm_bindgen_test::*;
 
     wasm_bindgen_test_configure!(run_in_browser);
 
     #[wasm_bindgen_test]
-    fn websocket_works() {
+    async fn websocket_works() {
         let ws_echo_server_url =
             option_env!("WS_ECHO_SERVER_URL").expect("Did you set WS_ECHO_SERVER_URL?");
 
         let ws = WebSocket::open(ws_echo_server_url).unwrap();
         let (mut sender, mut receiver) = ws.split();
 
-        spawn_local(async move {
-            sender
-                .send(Message::Text(String::from("test 1")))
-                .await
-                .unwrap();
-            sender
-                .send(Message::Text(String::from("test 2")))
-                .await
-                .unwrap();
-        });
-
-        spawn_local(async move {
-            // ignore first message
-            // the echo-server uses it to send it's info in the first message
-            let _ = receiver.next().await;
-
-            assert_eq!(
-                receiver.next().await.unwrap().unwrap(),
-                Message::Text("test 1".to_string())
-            );
-            assert_eq!(
-                receiver.next().await.unwrap().unwrap(),
-                Message::Text("test 2".to_string())
-            );
-        });
+        sender
+            .send(Message::Text(String::from("test 1")))
+            .await
+            .unwrap();
+        sender
+            .send(Message::Text(String::from("test 2")))
+            .await
+            .unwrap();
+
+        // ignore first message
+        // the echo-server uses it to send it's info in the first message
+        let _ = receiver.next().await;
+
+        assert_eq!(
+            receiver.next().await.unwrap().unwrap(),
+            Message::Text("test 1".to_string())
+        );
+        assert_eq!(
+            receiver.next().await.unwrap().unwrap(),
+            Message::Text("test 2".to_string())
+        );
     }
 }