From fb45da1890e874b63f023e1260ff8c664603aba1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 19 May 2025 15:46:57 +0200 Subject: [PATCH] some test fixes --- satrs-example/src/interface/udp.rs | 5 +++-- satrs/src/encoding/ccsds.rs | 4 ++-- satrs/src/hal/std/udp_server.rs | 1 - satrs/tests/pus_verification.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/satrs-example/src/interface/udp.rs b/satrs-example/src/interface/udp.rs index bf0a71c..f9c3c78 100644 --- a/satrs-example/src/interface/udp.rs +++ b/satrs-example/src/interface/udp.rs @@ -119,7 +119,8 @@ mod tests { }, ComponentId, }; - use satrs_example::config::{components, OBSW_SERVER_ADDR}; + use satrs_example::config::OBSW_SERVER_ADDR; + use satrs_example::ids; use crate::tmtc::sender::{MockSender, TmTcSender}; @@ -175,7 +176,7 @@ mod tests { udp_tc_server, tm_handler, }; - let sph = SpHeader::new_for_unseg_tc(components::Apid::GenericPus as u16, 0, 0); + let sph = SpHeader::new_for_unseg_tc(ids::Apid::GenericPus as u16, 0, 0); let ping_tc = PusTcCreator::new_simple(sph, 17, 1, &[], true) .to_vec() .unwrap(); diff --git a/satrs/src/encoding/ccsds.rs b/satrs/src/encoding/ccsds.rs index 1f21426..0f8693a 100644 --- a/satrs/src/encoding/ccsds.rs +++ b/satrs/src/encoding/ccsds.rs @@ -90,8 +90,8 @@ pub fn parse_buffer_for_ccsds_space_packets( #[cfg(test)] mod tests { use spacepackets::{ - ecss::{tc::PusTcCreator, WritablePusPacket}, - CcsdsPacket, PacketId, PacketSequenceCtrl, PacketType, SequenceFlags, SpHeader, + ecss::tc::PusTcCreator, CcsdsPacket, PacketId, PacketSequenceCtrl, PacketType, + SequenceFlags, SpHeader, }; use crate::{encoding::tests::TcCacher, ComponentId}; diff --git a/satrs/src/hal/std/udp_server.rs b/satrs/src/hal/std/udp_server.rs index 4211c77..5db42fa 100644 --- a/satrs/src/hal/std/udp_server.rs +++ b/satrs/src/hal/std/udp_server.rs @@ -129,7 +129,6 @@ mod tests { use crate::ComponentId; use core::cell::RefCell; use spacepackets::ecss::tc::PusTcCreator; - use spacepackets::ecss::WritablePusPacket; use spacepackets::SpHeader; use std::collections::VecDeque; use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}; diff --git a/satrs/tests/pus_verification.rs b/satrs/tests/pus_verification.rs index f8d01f1..16bb1f8 100644 --- a/satrs/tests/pus_verification.rs +++ b/satrs/tests/pus_verification.rs @@ -46,8 +46,8 @@ pub mod crossbeam_test { let sender = PacketSenderWithSharedPool::new_with_shared_packet_pool(tx.clone(), &shared_tm_pool); let sender_1 = sender.clone(); - let mut reporter_with_sender_0 = VerificationReporter::new(TEST_COMPONENT_ID_0.id(), &cfg); - let mut reporter_with_sender_1 = reporter_with_sender_0.clone(); + let reporter_with_sender_0 = VerificationReporter::new(TEST_COMPONENT_ID_0.id(), &cfg); + let reporter_with_sender_1 = reporter_with_sender_0.clone(); // For test purposes, we retrieve the request ID from the TCs and pass them to the receiver // tread. let req_id_0;