From a61474f38ad5f5a06054e6d320db1b215cb05f9f Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Mon, 21 Apr 2025 22:29:15 -0400 Subject: [PATCH] Clean up dead code. --- src/client.rs | 27 +++++---------------------- src/document.rs | 4 ---- src/lib.rs | 14 -------------- src/main.rs | 9 +++------ src/queue.rs | 6 ++---- src/utils.rs | 17 ----------------- 6 files changed, 10 insertions(+), 67 deletions(-) delete mode 100644 src/utils.rs diff --git a/src/client.rs b/src/client.rs index 3f861f1..2a0a9e8 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,8 +1,4 @@ -use crate::{ - field::Field, - queue::{Message, MsgType, Queue}, - utils::GenID, -}; +use crate::queue::{Message, MsgType, Queue}; use std::{ collections::HashMap, sync::{ @@ -40,7 +36,7 @@ impl ClientChannel { } let (tx, rx) = channel(); reg.insert(msg.get_id(), tx); - self.queue.send(msg); + self.queue.send(msg).unwrap(); rx } @@ -60,17 +56,6 @@ mod client_channels { static TIMEOUT: Duration = Duration::from_millis(500); - #[test] - fn request_new_message() { - let queue = Queue::new(); - let chan = ClientChannel::new(queue); - let msg_types = [MsgType::Document, MsgType::Time]; - for msg_type in msg_types.iter() { - let msg = Message::new(msg_type.clone()); - assert_eq!(msg.get_msg_type(), msg_type); - } - } - #[test] fn fowards_message() { let msg_type = MsgType::Document; @@ -122,15 +107,13 @@ mod client_channels { pub struct Client { channel: ClientChannel, - queue: Queue, rx: Receiver, } impl Client { - fn new(chan: ClientChannel, queue: Queue, rx: Receiver) -> Self { + fn new(chan: ClientChannel, rx: Receiver) -> Self { Self { channel: chan, - queue: queue, rx: rx, } } @@ -139,7 +122,7 @@ impl Client { let (tx, rx) = channel(); queue.add(tx.clone(), RESPONS_TO.to_vec()); let chan = ClientChannel::new(queue.clone()); - let client = Client::new(chan.clone(), queue, rx); + let client = Client::new(chan.clone(), rx); spawn(move || { client.listen(); }); @@ -171,7 +154,7 @@ mod clients { let chan_rx = chan.send(Message::new(MsgType::SessionValidate)); let msg = queue_rx.recv_timeout(TIMEOUT).unwrap(); let expected = create_validated_reply(msg); - queue.send(expected.clone()); + queue.send(expected.clone()).unwrap(); let result = chan_rx.recv_timeout(TIMEOUT).unwrap(); assert_eq!(result.get_id(), expected.get_id()); assert_eq!(result.get_msg_type(), expected.get_msg_type()); diff --git a/src/document.rs b/src/document.rs index 6812689..5b2f208 100644 --- a/src/document.rs +++ b/src/document.rs @@ -50,10 +50,6 @@ pub mod documents { const TIMEOUT: Duration = Duration::from_millis(500); - pub fn get_root_document() -> Message { - Message::new(MsgType::DocumentRequest) - } - fn setup_document(listen_for: Vec) -> (Queue, Receiver) { let queue = Queue::new(); let (tx, rx) = channel(); diff --git a/src/lib.rs b/src/lib.rs index 627134c..95dca2f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,6 @@ mod document; mod field; mod queue; mod session; -mod utils; use client::{Client, ClientChannel}; use clock::Clock; @@ -43,17 +42,4 @@ impl MoreThanText { let reply = rx.recv().unwrap(); reply.get_data("sess_id").unwrap().to_uuid().unwrap() } - - pub fn request(&mut self, session: Option) -> Message - where - F: Into, - { - let sess = match session { - Some(id) => Some(id.into()), - None => None, - }; - let req = Message::new(MsgType::DocumentRequest); - let rx = self.client_channel.send(req.into()); - rx.recv().unwrap() - } } diff --git a/src/main.rs b/src/main.rs index 0bc5dc1..c3fff9b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -60,7 +60,7 @@ where { type Rejection = Infallible; - async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { + async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result { let Extension(cookies) = parts.extract::>().await.unwrap(); let Extension(mut state) = parts.extract::>().await.unwrap(); let req_id = match cookies.get(SESSION_KEY) { @@ -80,10 +80,7 @@ where } } -async fn mtt_conn( - sess_id: SessionID, - state: State, -) -> impl IntoResponse { +async fn mtt_conn(_sess_id: SessionID, _state: State) -> impl IntoResponse { ("something".to_string(),) } @@ -141,7 +138,7 @@ mod servers { .unwrap(); assert_eq!(initial.status(), StatusCode::OK); let sessid = initial.headers().get(SET_COOKIE).unwrap(); - let mut request = Request::builder() + let request = Request::builder() .uri("/") .header(COOKIE, sessid.clone()) .body(Body::empty()) diff --git a/src/queue.rs b/src/queue.rs index 52483cb..ae2530e 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -7,7 +7,6 @@ use uuid::Uuid; #[derive(Clone, Debug, Eq, Hash, PartialEq)] pub enum MsgType { - ClientRequest, Document, DocumentRequest, SessionValidate, @@ -79,7 +78,6 @@ impl Message { #[cfg(test)] mod messages { use super::*; - use crate::document::documents::get_root_document; #[test] fn new_message() { @@ -108,11 +106,11 @@ mod messages { let mut msg = Message::new(MsgType::SessionValidate); msg.id = id.clone(); msg.add_data("test", "test"); - let data = MsgType::ClientRequest; + let data = MsgType::SessionValidate; let result = msg.reply(data); assert_eq!(result.id, id); match result.msg_type { - MsgType::ClientRequest => {} + MsgType::SessionValidate => {} _ => unreachable!("should have been a registration request"), } assert!(result.data.is_empty()); diff --git a/src/utils.rs b/src/utils.rs deleted file mode 100644 index 6726153..0000000 --- a/src/utils.rs +++ /dev/null @@ -1,17 +0,0 @@ -use uuid::Uuid; - -pub struct GenID; - -impl GenID { - pub fn new() -> Self { - GenID {} - } -} - -impl Iterator for GenID { - type Item = Uuid; - - fn next(&mut self) -> Option { - Some(Uuid::new_v4()) - } -}