From d5a54b6b5f028f8066ce59bccc10406f4c44154e Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 12 Jan 2024 15:40:49 -0500 Subject: [PATCH] keyforkd-client: replace deprecated tempdir with tempfile --- Cargo.lock | 90 ++++++------------------------------ keyforkd-client/Cargo.toml | 2 +- keyforkd-client/src/tests.rs | 5 +- 3 files changed, 17 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7185856..3f537d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -748,7 +748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -760,7 +760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -935,7 +935,7 @@ dependencies = [ "generic-array", "group", "pkcs8 0.10.2", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -1020,7 +1020,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1057,12 +1057,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futures" version = "0.3.30" @@ -1279,7 +1273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1733,7 +1727,7 @@ dependencies = [ "keyfork-slip10-test-data", "keyforkd", "keyforkd-models", - "tempdir", + "tempfile", "thiserror", "tokio", ] @@ -1991,7 +1985,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "smallvec", "zeroize", ] @@ -2366,19 +2360,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.8.5" @@ -2387,7 +2368,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2397,24 +2378,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.6.4" @@ -2424,15 +2390,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2503,15 +2460,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "ripemd" version = "0.1.3" @@ -2546,7 +2494,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8 0.9.0", - "rand_core 0.6.4", + "rand_core", "signature", "subtle", "zeroize", @@ -2661,7 +2609,7 @@ dependencies = [ "memsec", "nettle", "once_cell", - "rand 0.8.5", + "rand", "regex", "regex-syntax 0.8.2", "sha1collisiondetection", @@ -2762,7 +2710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "902b1e955f8a2e429fb1bad49f83fb952e6195d3c360ac547ff00fb826388753" dependencies = [ "hashbrown 0.9.1", - "rand 0.8.5", + "rand", "zeroize", ] @@ -2809,7 +2757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2936,16 +2884,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - [[package]] name = "tempfile" version = "3.9.0" @@ -3534,7 +3472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ "curve25519-dalek", - "rand_core 0.6.4", + "rand_core", "serde", "zeroize", ] diff --git a/keyforkd-client/Cargo.toml b/keyforkd-client/Cargo.toml index 4323b3a..bd5bae4 100644 --- a/keyforkd-client/Cargo.toml +++ b/keyforkd-client/Cargo.toml @@ -21,5 +21,5 @@ thiserror = "1.0.49" [dev-dependencies] keyfork-slip10-test-data = { path = "../keyfork-slip10-test-data" } keyforkd = { path = "../keyforkd" } -tempdir = "0.3.7" +tempfile = "3.9.0" tokio = { version = "1.32.0", features = ["rt", "sync", "rt-multi-thread"] } diff --git a/keyforkd-client/src/tests.rs b/keyforkd-client/src/tests.rs index 6c3a760..a3aabfb 100644 --- a/keyforkd-client/src/tests.rs +++ b/keyforkd-client/src/tests.rs @@ -3,7 +3,6 @@ use keyfork_derive_util::{request::*, DerivationPath}; use keyfork_slip10_test_data::test_data; use std::sync::mpsc::channel; use std::{os::unix::net::UnixStream, str::FromStr}; -use tempdir::TempDir; use tokio::runtime::Builder; #[test] @@ -15,7 +14,7 @@ fn secp256k1() { // note: since client is non async, can't be single threaded let rt = Builder::new_multi_thread().enable_io().build().unwrap(); - let tempdir = TempDir::new("keyfork-seed").unwrap(); + let tempdir = tempfile::tempdir().unwrap(); for (i, per_seed) in tests.into_iter().enumerate() { let mut socket_name = i.to_string(); socket_name.push_str("-keyforkd.sock"); @@ -60,7 +59,7 @@ fn ed25519() { let tests = test_data().unwrap().remove(&"ed25519".to_string()).unwrap(); let rt = Builder::new_multi_thread().enable_io().build().unwrap(); - let tempdir = TempDir::new("keyfork-seed").unwrap(); + let tempdir = tempfile::tempdir().unwrap(); for (i, per_seed) in tests.into_iter().enumerate() { let mut socket_name = i.to_string(); socket_name.push_str("-keyforkd.sock");