refactor tsets

Author: cowlicks

src/test_utils.rs

@@ -180,20 +180,20 @@ pub(crate) fn create_result_connected() -> (
 }
 
 #[cfg(test)]
-mod test_test_utils {
-    use super::*;
-    use futures::SinkExt;
+mod test {
+    #![allow(unused_imports)] // test's within tests  confused clippy
+    use futures::{SinkExt, StreamExt};
     #[tokio::test]
     async fn way_one() {
-        let mut a = Io::default();
+        let mut a = super::Io::default();
         let _ = a.send(b"hello".into()).await;
         let Some(res) = a.next().await else { panic!() };
         assert_eq!(res, b"hello");
     }
 
     #[tokio::test]
     async fn split() {
-        let (mut left, mut right) = (TwoWay::default()).split_sides();
+        let (mut left, mut right) = (super::TwoWay::default()).split_sides();
         left.send(b"hello".to_vec()).await.unwrap();
         let Some(res) = right.next().await else {
             panic!();

tests/js_interop.rs

@@ -1,7 +1,11 @@
+pub mod _util;
 #[path = "../src/test_utils.rs"]
 mod test_utils;
+
 use _util::wait_for_localhost_port;
 use anyhow::Result;
+#[cfg(feature = "tokio")]
+use async_compat::CompatExt;
 use futures::Future;
 use futures_lite::stream::StreamExt;
 use hypercore::{
@@ -14,9 +18,6 @@ use std::{
     path::Path,
     sync::{Arc, Once},
 };
-
-#[cfg(feature = "tokio")]
-use async_compat::CompatExt;
 #[cfg(feature = "tokio")]
 use tokio::{
     fs::{metadata, File},
@@ -29,7 +30,6 @@ use tokio::{
 
 use hypercore_protocol::{discovery_key, schema::*, Channel, Event, Message, ProtocolBuilder};
 
-pub mod _util;
 mod js;
 use js::{cleanup, install, js_run_client, js_start_server, prepare_test_set};
 
@@ -40,6 +40,7 @@ fn init() {
         cleanup();
         install();
     });
+    test_utils::log();
 }
 
 const TEST_SET_NODE_CLIENT_NODE_SERVER: &str = "ncns";