chore(rw-stream-sink): use tokio instead of async-std in tests

ref libp2p#4449

I think this is the last one in this issue. If you let me know, I can use "closes" to close the issue.

Pull-Request: libp2p#6023.

Author: kamuik16

Cargo.lock

@@ -16,7 +16,7 @@ pin-project = "1.1.5"
 static_assertions = "1"
 
 [dev-dependencies]
-async-std = "1.0"
+tokio = { workspace = true, features = ["rt", "macros"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling

misc/rw-stream-sink/Cargo.toml

@@ -121,7 +121,6 @@ mod tests {
         task::{Context, Poll},
     };
 
-    use async_std::task;
     use futures::{channel::mpsc, prelude::*};
 
     use super::RwStreamSink;
@@ -165,58 +164,52 @@ mod tests {
         }
     }
 
-    #[test]
-    fn basic_reading() {
+    #[tokio::test]
+    async fn basic_reading() {
         let (tx1, _) = mpsc::channel::<Vec<u8>>(10);
         let (mut tx2, rx2) = mpsc::channel(10);
 
         let mut wrapper = RwStreamSink::new(Wrapper(rx2.map(Ok), tx1));
 
-        task::block_on(async move {
-            tx2.send(Vec::from("hel")).await.unwrap();
-            tx2.send(Vec::from("lo wor")).await.unwrap();
-            tx2.send(Vec::from("ld")).await.unwrap();
-            tx2.close().await.unwrap();
+        tx2.send(Vec::from("hel")).await.unwrap();
+        tx2.send(Vec::from("lo wor")).await.unwrap();
+        tx2.send(Vec::from("ld")).await.unwrap();
+        tx2.close().await.unwrap();
 
-            let mut data = Vec::new();
-            wrapper.read_to_end(&mut data).await.unwrap();
-            assert_eq!(data, b"hello world");
-        })
+        let mut data = Vec::new();
+        wrapper.read_to_end(&mut data).await.unwrap();
+        assert_eq!(data, b"hello world");
     }
 
-    #[test]
-    fn skip_empty_stream_items() {
+    #[tokio::test]
+    async fn skip_empty_stream_items() {
         let data: Vec<&[u8]> = vec![b"", b"foo", b"", b"bar", b"", b"baz", b""];
         let mut rws = RwStreamSink::new(stream::iter(data).map(Ok));
         let mut buf = [0; 9];
-        task::block_on(async move {
-            assert_eq!(3, rws.read(&mut buf).await.unwrap());
-            assert_eq!(3, rws.read(&mut buf[3..]).await.unwrap());
-            assert_eq!(3, rws.read(&mut buf[6..]).await.unwrap());
-            assert_eq!(0, rws.read(&mut buf).await.unwrap());
-            assert_eq!(b"foobarbaz", &buf[..])
-        })
+        assert_eq!(3, rws.read(&mut buf).await.unwrap());
+        assert_eq!(3, rws.read(&mut buf[3..]).await.unwrap());
+        assert_eq!(3, rws.read(&mut buf[6..]).await.unwrap());
+        assert_eq!(0, rws.read(&mut buf).await.unwrap());
+        assert_eq!(b"foobarbaz", &buf[..])
     }
 
-    #[test]
-    fn partial_read() {
+    #[tokio::test]
+    async fn partial_read() {
         let data: Vec<&[u8]> = vec![b"hell", b"o world"];
         let mut rws = RwStreamSink::new(stream::iter(data).map(Ok));
         let mut buf = [0; 3];
-        task::block_on(async move {
-            assert_eq!(3, rws.read(&mut buf).await.unwrap());
-            assert_eq!(b"hel", &buf[..3]);
-            assert_eq!(0, rws.read(&mut buf[..0]).await.unwrap());
-            assert_eq!(1, rws.read(&mut buf).await.unwrap());
-            assert_eq!(b"l", &buf[..1]);
-            assert_eq!(3, rws.read(&mut buf).await.unwrap());
-            assert_eq!(b"o w", &buf[..3]);
-            assert_eq!(0, rws.read(&mut buf[..0]).await.unwrap());
-            assert_eq!(3, rws.read(&mut buf).await.unwrap());
-            assert_eq!(b"orl", &buf[..3]);
-            assert_eq!(1, rws.read(&mut buf).await.unwrap());
-            assert_eq!(b"d", &buf[..1]);
-            assert_eq!(0, rws.read(&mut buf).await.unwrap());
-        })
+        assert_eq!(3, rws.read(&mut buf).await.unwrap());
+        assert_eq!(b"hel", &buf[..3]);
+        assert_eq!(0, rws.read(&mut buf[..0]).await.unwrap());
+        assert_eq!(1, rws.read(&mut buf).await.unwrap());
+        assert_eq!(b"l", &buf[..1]);
+        assert_eq!(3, rws.read(&mut buf).await.unwrap());
+        assert_eq!(b"o w", &buf[..3]);
+        assert_eq!(0, rws.read(&mut buf[..0]).await.unwrap());
+        assert_eq!(3, rws.read(&mut buf).await.unwrap());
+        assert_eq!(b"orl", &buf[..3]);
+        assert_eq!(1, rws.read(&mut buf).await.unwrap());
+        assert_eq!(b"d", &buf[..1]);
+        assert_eq!(0, rws.read(&mut buf).await.unwrap());
     }
 }