From b6c15deae692f18f64da328bc4cc163531ca6735 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:44:56 +0200 Subject: [PATCH] build(deps): bump sysinfo from 0.27.8 to 0.30.12 (#4795) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(deps): bump sysinfo from 0.27.8 to 0.30.12 Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.27.8 to 0.30.12. - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/commits) --- updated-dependencies: - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Migrade to latest sysinfo in mixnode legacy hardware * Use workspace version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jon Häggblad --- Cargo.lock | 19 ++----------------- mixnode/Cargo.toml | 2 +- mixnode/src/node/http/legacy/hardware.rs | 4 ++-- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1b356fe44..17814faec5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5234,7 +5234,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sysinfo 0.27.8", + "sysinfo", "thiserror", "time", "tokio", @@ -5415,7 +5415,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sysinfo 0.30.12", + "sysinfo", "thiserror", "tokio", "toml 0.8.14", @@ -8636,21 +8636,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[package]] -name = "sysinfo" -version = "0.27.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - [[package]] name = "sysinfo" version = "0.30.12" diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index db4473b530..6066817e0c 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -31,7 +31,7 @@ log = { workspace = true } rand = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -sysinfo = "0.27.7" +sysinfo = { workspace = true } time.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } tokio-util = { workspace = true, features = ["codec"] } diff --git a/mixnode/src/node/http/legacy/hardware.rs b/mixnode/src/node/http/legacy/hardware.rs index a64ca3f5b5..b1ce61b6ff 100644 --- a/mixnode/src/node/http/legacy/hardware.rs +++ b/mixnode/src/node/http/legacy/hardware.rs @@ -5,7 +5,7 @@ use axum::extract::Query; use cupid::TopologyType; use nym_http_api_common::{FormattedResponse, OutputParams}; use serde::Serialize; -use sysinfo::{System, SystemExt}; +use sysinfo::System; #[derive(Serialize, Debug)] pub struct Hardware { @@ -43,7 +43,7 @@ fn hardware_info() -> Option { /// Sysinfo gives back basic stuff like number of CPU cores and available memory. If available, this includes the hardware encryption /// extensions report fn hardware_from_sysinfo(crypto_hardware: Option) -> Option { - if System::IS_SUPPORTED { + if sysinfo::IS_SUPPORTED_SYSTEM { let mut system = System::new_all(); system.refresh_all(); let ram = format!("{}KB", system.total_memory());