Skip to content

Commit d756866

Browse files
chore: cleanup
1 parent 9108239 commit d756866

20 files changed

+193
-374
lines changed

mqrstt/README.md README.md

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ fn main() {
9494
assert_eq!(result.unwrap(), NetworkStatus::OutgoingDisconnect);
9595
});
9696
}
97-
9897
```
9998

10099
### Tokio example:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/tcp/src/tokio.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ pub struct Handler {
55
}
66

77
impl AsyncEventHandler for Handler {
8-
fn handle(&mut self, incoming_packet: mqrstt::packets::Packet) -> impl std::future::Future<Output = ()> + Send + Sync {
9-
async move {
10-
if let mqrstt::packets::Packet::Publish(publish) = incoming_packet {
11-
self.byte_count += publish.payload.len() as u64;
12-
}
8+
async fn handle(&mut self, incoming_packet: mqrstt::packets::Packet) {
9+
if let mqrstt::packets::Packet::Publish(publish) = incoming_packet {
10+
self.byte_count += publish.payload.len() as u64;
1311
}
1412
}
1513
}

mqrstt/src/packets/connect/mod.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,7 @@ mod tests {
360360
];
361361

362362
buf.extend_from_slice(packet);
363-
let c = Connect::read(0, 0, buf.into()).unwrap();
364-
365-
dbg!(c);
363+
Connect::read(0, 0, buf.into()).unwrap();
366364
}
367365

368366
#[test]
@@ -427,8 +425,6 @@ mod tests {
427425
c.write(&mut write_buf).unwrap();
428426

429427
assert_eq!(packet.to_vec(), write_buf.to_vec());
430-
431-
dbg!(c);
432428
}
433429

434430
#[tokio::test]
@@ -522,8 +518,6 @@ mod tests {
522518

523519
let c = Connect::read(0, 0, buf.into()).unwrap();
524520

525-
dbg!(c.clone());
526-
527521
let mut write_buf = bytes::BytesMut::new();
528522
c.write(&mut write_buf).unwrap();
529523

mqrstt/src/packets/mod.rs

-168
Original file line numberDiff line numberDiff line change
@@ -442,171 +442,3 @@ impl std::fmt::Display for PacketType {
442442
std::fmt::Debug::fmt(&self, f)
443443
}
444444
}
445-
446-
#[cfg(test)]
447-
mod tests {
448-
449-
use bytes::BytesMut;
450-
451-
use crate::packets::Packet;
452-
453-
use crate::tests::test_packets::*;
454-
455-
#[rstest::rstest]
456-
#[case::connect_case(connect_case())]
457-
#[case::ping_req_case(ping_req_case().1)]
458-
#[case::ping_resp_case(ping_resp_case().1)]
459-
#[case::connack_case(connack_case().1)]
460-
#[case::create_subscribe_packet(create_subscribe_packet(1))]
461-
#[case::create_subscribe_packet(create_subscribe_packet(65335))]
462-
#[case::create_puback_packet(create_puback_packet(1))]
463-
#[case::create_puback_packet(create_puback_packet(65335))]
464-
#[case::create_disconnect_packet(create_disconnect_packet())]
465-
#[case::create_connack_packet(create_connack_packet(true))]
466-
#[case::create_connack_packet(create_connack_packet(false))]
467-
#[case::publish_packet_1(publish_packet_1())]
468-
#[case::publish_packet_2(publish_packet_2())]
469-
#[case::publish_packet_3(publish_packet_3())]
470-
#[case::publish_packet_4(publish_packet_4())]
471-
#[case::create_empty_publish_packet(create_empty_publish_packet())]
472-
#[case::subscribe(subscribe_case())]
473-
#[case::suback(suback_case())]
474-
#[case::unsubscribe(unsubscribe_case())]
475-
#[case::unsuback(unsuback_case())]
476-
#[case::pubcomp_case(pubcomp_case())]
477-
#[case::pubrec_case(pubrec_case())]
478-
#[case::pubrec_case(pubrel_case2())]
479-
#[case::auth_case(auth_case())]
480-
fn test_write_read_write_read_cases(#[case] packet: Packet) {
481-
use crate::packets::WireLength;
482-
483-
let mut buffer = BytesMut::new();
484-
485-
packet.write(&mut buffer).unwrap();
486-
487-
let wire_len = packet.wire_len();
488-
assert_eq!(wire_len, buffer.len());
489-
490-
// dbg!(wire_len);
491-
492-
// let a: Vec<_> = buffer.iter().map(|f| *f as u16).collect();
493-
// println!("{:?}", a);
494-
495-
let res1 = Packet::read(&mut buffer).unwrap();
496-
497-
assert_eq!(packet, res1);
498-
499-
let mut buffer = BytesMut::new();
500-
res1.write(&mut buffer).unwrap();
501-
let res2 = Packet::read(&mut buffer).unwrap();
502-
503-
assert_eq!(res1, res2);
504-
}
505-
506-
#[rstest::rstest]
507-
#[case::connect_case(connect_case())]
508-
#[case::ping_req_case(ping_req_case().1)]
509-
#[case::ping_resp_case(ping_resp_case().1)]
510-
#[case::connack_case(connack_case().1)]
511-
#[case::create_subscribe_packet(create_subscribe_packet(1))]
512-
#[case::create_subscribe_packet(create_subscribe_packet(65335))]
513-
#[case::create_puback_packet(create_puback_packet(1))]
514-
#[case::create_puback_packet(create_puback_packet(65335))]
515-
#[case::create_disconnect_packet(create_disconnect_packet())]
516-
#[case::create_connack_packet(create_connack_packet(true))]
517-
#[case::create_connack_packet(create_connack_packet(false))]
518-
#[case::publish_packet_1(publish_packet_1())]
519-
#[case::publish_packet_2(publish_packet_2())]
520-
#[case::publish_packet_3(publish_packet_3())]
521-
#[case::publish_packet_4(publish_packet_4())]
522-
#[case::create_empty_publish_packet(create_empty_publish_packet())]
523-
#[case::subscribe(subscribe_case())]
524-
#[case::suback(suback_case())]
525-
#[case::unsubscribe(unsubscribe_case())]
526-
#[case::unsuback(unsuback_case())]
527-
#[case::pubcomp_case(pubcomp_case())]
528-
#[case::pubrec_case(pubrec_case())]
529-
#[case::pubrec_case(pubrel_case2())]
530-
#[case::auth_case(auth_case())]
531-
#[tokio::test]
532-
async fn test_async_write_read_write_read_cases(#[case] packet: Packet) {
533-
use crate::packets::WireLength;
534-
535-
let mut buffer = Vec::with_capacity(1000);
536-
let res = packet.async_write(&mut buffer).await.unwrap();
537-
538-
let wire_len = packet.wire_len();
539-
540-
assert_eq!(res, buffer.len());
541-
assert_eq!(wire_len, buffer.len());
542-
543-
let mut buf = buffer.as_slice();
544-
545-
let res1 = Packet::async_read(&mut buf).await.unwrap();
546-
547-
pretty_assertions::assert_eq!(packet, res1);
548-
}
549-
550-
#[rstest::rstest]
551-
#[case::disconnect(disconnect_case())]
552-
#[case::ping_req(ping_req_case())]
553-
#[case::ping_resp(ping_resp_case())]
554-
#[case::publish(publish_case())]
555-
#[case::pubrel(pubrel_case())]
556-
#[case::pubrel_smallest(pubrel_smallest_case())]
557-
fn test_read_write_cases(#[case] (bytes, expected_packet): (&[u8], Packet)) {
558-
let mut buffer = BytesMut::from_iter(bytes);
559-
560-
let res = Packet::read(&mut buffer);
561-
562-
assert!(res.is_ok());
563-
564-
let packet = res.unwrap();
565-
566-
assert_eq!(packet, expected_packet);
567-
568-
buffer.clear();
569-
570-
packet.write(&mut buffer).unwrap();
571-
572-
assert_eq!(buffer.to_vec(), bytes.to_vec())
573-
}
574-
575-
#[rstest::rstest]
576-
#[case::disconnect(disconnect_case())]
577-
#[case::ping_req(ping_req_case())]
578-
#[case::ping_resp(ping_resp_case())]
579-
#[case::publish(publish_case())]
580-
#[case::pubrel(pubrel_case())]
581-
#[case::pubrel_smallest(pubrel_smallest_case())]
582-
#[tokio::test]
583-
async fn test_async_read_write(#[case] (mut bytes, expected_packet): (&[u8], Packet)) {
584-
let input = bytes.to_vec();
585-
586-
let res = Packet::async_read(&mut bytes).await;
587-
588-
dbg!(&res);
589-
assert!(res.is_ok());
590-
591-
let packet = res.unwrap();
592-
593-
assert_eq!(packet, expected_packet);
594-
595-
let mut out = Vec::with_capacity(1000);
596-
597-
packet.async_write(&mut out).await.unwrap();
598-
599-
assert_eq!(out, input)
600-
}
601-
602-
// #[rstest::rstest]
603-
// #[case(&[59, 1, 0, 59])]
604-
// #[case(&[16, 14, 0, 4, 77, 81, 84, 84, 5, 247, 247, 252, 1, 17, 247, 247, 247])]
605-
// fn test_read_error(#[case] bytes: &[u8]) {
606-
// let mut buffer = BytesMut::from_iter(bytes);
607-
608-
// let res = Packet::read_from_buffer(&mut buffer);
609-
610-
// assert!(res.is_err());
611-
// }
612-
}

mqrstt/src/packets/subscribe/mod.rs

-11
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,6 @@ mod tests {
434434
0x35, 0xd6, 0x02, 0x0b, 0x01, 0x00, 0x16, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x15,
435435
];
436436

437-
// let sub_data = &[0x35, 0xd6, 0x02, 0x0b, 0x01, 0x00, 0x16, 0x73,
438-
// 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
439-
// 0x2f, 0x74, 0x65, 0x73, 0x74, 0x15];
440-
441-
// let sub_data = &[
442-
// 53, 214, 2, 11, 1, 0, 22, 115, 117, 98, 115,
443-
// 99, 114, 105, 98, 101, 47, 101, 120, 97, 109,
444-
// 112, 108, 101, 47, 116, 101, 115, 116, 21,
445-
// ];
446437

447438
let mut bufmut = BytesMut::new();
448439
bufmut.extend(&sub_data[..]);
@@ -451,8 +442,6 @@ mod tests {
451442

452443
let s = Subscribe::read(0, 30, buf.clone()).unwrap();
453444

454-
let s = dbg!(s);
455-
456445
let mut result = BytesMut::new();
457446
s.write(&mut result).unwrap();
458447

mqrstt/src/state_handler.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,11 @@ mod handler_tests {
251251
Packet, PubComp, PubCompProperties, PubCompReasonCode, PubRec, PubRecProperties, PubRecReasonCode, PubRel, PubRelProperties, PubRelReasonCode, QoS, SubAck, SubAckProperties,
252252
SubAckReasonCode, UnsubAck, UnsubAckProperties, UnsubAckReasonCode,
253253
},
254-
tests::test_packets::{create_connack_packet, create_puback_packet, create_publish_packet, create_subscribe_packet, create_unsubscribe_packet},
255254
ConnectOptions, StateHandler,
256255
};
256+
257+
use crate::tests::test_packets::*;
258+
257259
fn handler(clean_start: bool) -> (StateHandler, Receiver<u16>) {
258260
let (apkids, apkids_r) = AvailablePacketIds::new(100);
259261

mqrstt/src/tests/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
pub mod resources;
21
mod test_bytes;
3-
pub mod test_packets;
4-
pub mod tls;
2+
pub(crate) mod test_packets;

mqrstt/src/tests/resources/mod.rs

-4
This file was deleted.

mqrstt/src/tests/resources/test_bytes_packet.rs

-93
This file was deleted.

0 commit comments

Comments
 (0)