From b8412722cc10f11cd8ca8164bdfdb26cb774c0d5 Mon Sep 17 00:00:00 2001 From: Denis Varlakov Date: Thu, 28 Nov 2024 13:18:59 +0100 Subject: [PATCH] Remove tokio runtime from the tests Signed-off-by: Denis Varlakov --- Cargo.lock | 84 ----------------------------------- tests/Cargo.toml | 4 +- tests/tests/it/interactive.rs | 5 +-- 3 files changed, 3 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae9cbea..69cc39b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "anyhow" version = "1.0.86" @@ -35,21 +20,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base16ct" version = "0.2.0" @@ -607,12 +577,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - [[package]] name = "givre" version = "0.1.1" @@ -638,7 +602,6 @@ dependencies = [ "anyhow", "bitcoin", "ed25519-dalek", - "futures", "generic-tests", "givre", "hex", @@ -649,7 +612,6 @@ dependencies = [ "round-based", "secp256k1", "test-case", - "tokio", ] [[package]] @@ -764,15 +726,6 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - [[package]] name = "num-bigint" version = "0.4.4" @@ -808,15 +761,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "phantom-type" version = "0.3.1" @@ -968,12 +912,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustc_version" version = "0.4.0" @@ -1236,28 +1174,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "tracing" version = "0.1.40" diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 285252a..5f217d5 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -11,16 +11,14 @@ givre = { path = "../givre", features = ["all-ciphersuites", "cggmp21-keygen", " generic-tests = "0.1" test-case = "3.3" -rand_dev = "0.1" rand = "0.8" rand_core = "0.6" +rand_dev = "0.1" hex = "0.4" hex-literal = "0.4" -tokio = { version = "1", features = ["macros", "rt"]} -futures = "0.3" round-based = { workspace = true, features = ["sim"] } ed25519 = { package = "ed25519-dalek", version = "2.1" } diff --git a/tests/tests/it/interactive.rs b/tests/tests/it/interactive.rs index 1def3f6..037d851 100644 --- a/tests/tests/it/interactive.rs +++ b/tests/tests/it/interactive.rs @@ -1,4 +1,4 @@ -#[generic_tests::define(attrs(test_case::case, tokio::test))] +#[generic_tests::define(attrs(test_case::case))] mod generic { use anyhow::Context; use givre::Ciphersuite; @@ -11,8 +11,7 @@ mod generic { #[test_case::case(Some(3), 5; "t3n5")] #[test_case::case(Some(5), 5; "t5n5")] #[test_case::case(None, 5; "n5")] - #[tokio::test] - async fn keygen_sign(t: Option, n: u16) { + fn keygen_sign(t: Option, n: u16) { let mut rng = rand_dev::DevRng::new(); // --- Keygen