fix: clippy lints, reduce test sleeps, remove flaky test, fix benches

Author: ramon-bernardo

crates/suon_channel/src/lib.rs

@@ -120,7 +120,7 @@ struct ScheduledTask {
 
 impl PartialOrd for ScheduledTask {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        other.at.partial_cmp(&self.at)
+        Some(self.cmp(other))
     }
 }
 

crates/suon_lua/benches/lua.rs

@@ -54,8 +54,8 @@ fn bench_dispatch_no_events(criterion: &mut Criterion) {
 
     criterion.bench_function("lua/dispatch_no_events", |bencher| {
         bencher.iter(|| {
-            let result = vm.trigger_event("NonExistent", black_box(42));
-            black_box(result);
+            vm.trigger_event("NonExistent", black_box(42))
+                .expect("bench dispatch must succeed");
         });
     });
 }
@@ -83,8 +83,8 @@ fn bench_dispatch_with_events(criterion: &mut Criterion) {
 
     criterion.bench_function("lua/dispatch_with_events", |bencher| {
         bencher.iter(|| {
-            let result = vm.trigger_event("BenchEvent", ());
-            black_box(result);
+            vm.trigger_event("BenchEvent", ())
+                .expect("bench dispatch must succeed");
         });
     });
 }

crates/suon_network/benches/reader.rs

@@ -1,7 +1,7 @@
 use criterion::{Criterion, Throughput, criterion_group, criterion_main};
 use std::hint::black_box;
 use suon_network::{
-    protocol::{PacketReader, ProcessError, ProcessOutcome},
+    protocol::PacketReader,
     server::tcp::{ProtocolSettings, RSA_KEY_SIZE, XTEA_KEY_BYTES, xtea_pad},
 };
 use suon_xtea::{Key, encrypt, expand};
@@ -59,8 +59,10 @@ fn xtea_decrypt(criterion: &mut Criterion) {
 
             bencher.iter(|| {
                 let mut proc_buf = body.clone();
-                let outcome = reader.process_in_place(&mut proc_buf);
-                black_box(outcome);
+                black_box(
+                    reader.process_in_place(&mut proc_buf)
+                        .expect("bench process must succeed"),
+                );
             });
         });
     }
@@ -93,7 +95,7 @@ fn rsa_handshake(criterion: &mut Criterion) {
             reader.set_rsa_key(rsa);
             let mut proc_buf = rsa_buf.clone();
             let outcome = reader.process_in_place(&mut proc_buf);
-            black_box(outcome);
+            let _ = black_box(outcome);
         });
     });
 
@@ -121,8 +123,10 @@ fn checksum_only(criterion: &mut Criterion) {
 
             bencher.iter(|| {
                 let mut proc_buf = body.clone();
-                let outcome = reader.process_in_place(&mut proc_buf);
-                black_box(outcome);
+                black_box(
+                    reader.process_in_place(&mut proc_buf)
+                        .expect("bench process must succeed"),
+                );
             });
         });
     }
@@ -147,8 +151,10 @@ fn plaintext(criterion: &mut Criterion) {
 
             bencher.iter(|| {
                 let mut proc_buf = data.clone();
-                let outcome = reader.process_in_place(&mut proc_buf);
-                black_box(outcome);
+                black_box(
+                    reader.process_in_place(&mut proc_buf)
+                        .expect("bench process must succeed"),
+                );
             });
         });
     }

crates/suon_network/benches/roundtrip.rs

@@ -46,8 +46,10 @@ fn bench_roundtrip(criterion: &mut Criterion) {
 
                 let body = &framed[2..];
                 let mut proc_buf = body.to_vec();
-                let outcome = reader.process_in_place(&mut proc_buf);
-                black_box(outcome);
+                black_box(
+                reader.process_in_place(&mut proc_buf)
+                    .expect("bench process must succeed"),
+            );
             });
         });
     }

crates/suon_network/src/protocol/reader.rs

@@ -160,10 +160,10 @@ impl PacketReader {
     /// RSA handshake — runs once per connection, sets XTEA key if found.
     fn process_rsa_handshake_in_place(
         &mut self,
-        body: &mut Vec<u8>,
+        body: &mut [u8],
     ) -> Result<ProcessOutcome, ProcessError> {
         let rsa = self.rsa_key.as_ref().ok_or(ProcessError::RsaError)?;
-        let mut decrypted = body.clone();
+        let mut decrypted = body.to_owned();
 
         if suon_rsa::decrypt(rsa, &mut decrypted).is_ok() {
             if decrypted.is_empty() || decrypted[0] != 0 {

crates/suon_network/src/server/binder.rs

@@ -235,7 +235,7 @@ mod tests {
             test_manager(),
         )
         .launch();
-        std::thread::sleep(Duration::from_millis(100));
+        std::thread::sleep(Duration::from_millis(10));
         drop(occupied);
     }
 
@@ -274,8 +274,8 @@ mod tests {
             test_manager(),
         )
         .launch();
-        std::thread::sleep(Duration::from_millis(30));
+        std::thread::sleep(Duration::from_millis(10));
         drop(occupied);
-        std::thread::sleep(Duration::from_millis(100));
+        std::thread::sleep(Duration::from_millis(10));
     }
 }

crates/suon_network/src/server/http/acceptor.rs

@@ -207,9 +207,9 @@ mod http_acceptor_tests {
         let settings = make_settings();
 
         HttpAcceptor::new(listener, channel, &settings, shutdown.clone()).spawn();
-        tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
+        tokio::time::sleep(tokio::time::Duration::from_millis(15)).await;
         shutdown.trigger();
-        tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
+        tokio::time::sleep(tokio::time::Duration::from_millis(15)).await;
     }
 
     #[tokio::test]
@@ -228,13 +228,13 @@ mod http_acceptor_tests {
 
         HttpAcceptor::new(listener, channel.clone(), &settings, shutdown.clone()).spawn();
 
-        tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
+        tokio::time::sleep(tokio::time::Duration::from_millis(15)).await;
 
         let client = tokio::net::TcpStream::connect(addr)
             .await
             .expect("failed to connect test client");
 
-        tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
+        tokio::time::sleep(tokio::time::Duration::from_millis(10)).await;
         drop(client);
         shutdown.trigger();
     }

crates/suon_network/src/server/http/manager.rs

@@ -23,6 +23,7 @@ pub struct HttpManager {
     manager: Arc<ConnectionManager>,
 }
 
+#[allow(dead_code)]
 impl HttpManager {
     pub fn new(manager: Arc<ConnectionManager>) -> Self {
         HttpManager { manager }

crates/suon_network/src/server/http/request.rs

@@ -4,6 +4,7 @@ use suon_channel::IntoTask;
 
 use super::task::HttpRequestTask;
 
+#[allow(dead_code)]
 pub(crate) struct HttpRequest {
     pub request_id: u64,
     pub method: String,

crates/suon_network/src/server/http/session.rs

@@ -219,7 +219,7 @@ mod tests {
         .await
         .expect("failed to send HTTP request from test client");
 
-        tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
+        tokio::time::sleep(tokio::time::Duration::from_millis(10)).await;
 
         drop(client);
         drop(server.await);