From 849fd5a82f168782f42715ea37161f1f1fe570ca Mon Sep 17 00:00:00 2001 From: pv42 Date: Sun, 11 Aug 2024 19:32:14 +0200 Subject: [PATCH] fix: remove std requirement for signing, fmt --- mavlink-core/Cargo.toml | 2 +- mavlink/tests/tcp_loopback_tests.rs | 5 +++-- mavlink/tests/test_shared/mod.rs | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mavlink-core/Cargo.toml b/mavlink-core/Cargo.toml index 3061080e73..b07d1eacf2 100644 --- a/mavlink-core/Cargo.toml +++ b/mavlink-core/Cargo.toml @@ -41,5 +41,5 @@ sha2 = { version = "0.10", optional = true } "embedded-hal-02" = ["dep:nb", "dep:embedded-hal-02"] "serde" = ["dep:serde", "dep:serde_arrays"] "tokio-1" = ["dep:tokio"] -"signing" = ["dep:sha2", "std"] +"signing" = ["dep:sha2"] default = ["std", "tcp", "udp", "direct-serial", "serde"] diff --git a/mavlink/tests/tcp_loopback_tests.rs b/mavlink/tests/tcp_loopback_tests.rs index e097febe42..7977c67256 100644 --- a/mavlink/tests/tcp_loopback_tests.rs +++ b/mavlink/tests/tcp_loopback_tests.rs @@ -9,7 +9,7 @@ mod test_tcp_connections { use crate::test_shared; - /// Test whether we can send a message via TCP and receive it OK. This also test signing as a property of a MavConnection if the signing feature is enabled. + /// Test whether we can send a message via TCP and receive it OK. This also test signing as a property of a MavConnection if the signing feature is enabled. #[test] pub fn test_tcp_loopback() { const RECEIVE_CHECK_COUNT: i32 = 5; @@ -21,7 +21,8 @@ mod test_tcp_connections { let server_thread = thread::spawn(move || { //TODO consider using get_available_port to use a random port - let mut server = mavlink::connect("tcpin:0.0.0.0:14550").expect("Couldn't create server"); + let mut server = + mavlink::connect("tcpin:0.0.0.0:14550").expect("Couldn't create server"); #[cfg(feature = "signing")] server.setup_signing(Some(singing_cfg_server)); diff --git a/mavlink/tests/test_shared/mod.rs b/mavlink/tests/test_shared/mod.rs index 45a72bf054..90f019cebd 100644 --- a/mavlink/tests/test_shared/mod.rs +++ b/mavlink/tests/test_shared/mod.rs @@ -8,9 +8,8 @@ pub const COMMON_MSG_HEADER: mavlink::MavHeader = mavlink::MavHeader { #[cfg(feature = "signing")] pub const SECRET_KEY: [u8; 32] = [ - 0x00, 0x01, 0xf2, 0xe3, 0xd4, 0xc5, 0xb6, 0xa7, 0x98, 0x00, 0x70, 0x76, 0x34, 0x32, 0x00, - 0x16, 0x22, 0x42, 0x00, 0xcc, 0xff, 0x7a, 0x00, 0x52, 0x75, 0x73, 0x74, 0x00, 0x4d, 0x41, - 0x56, 0xb3, + 0x00, 0x01, 0xf2, 0xe3, 0xd4, 0xc5, 0xb6, 0xa7, 0x98, 0x00, 0x70, 0x76, 0x34, 0x32, 0x00, 0x16, + 0x22, 0x42, 0x00, 0xcc, 0xff, 0x7a, 0x00, 0x52, 0x75, 0x73, 0x74, 0x00, 0x4d, 0x41, 0x56, 0xb3, ]; #[cfg(feature = "common")]