From f28f2251a1702b7ff738e72a039c84f2163e54a3 Mon Sep 17 00:00:00 2001
From: Neo Sun <huachuang20@gmail.com>
Date: Thu, 8 Dec 2022 21:09:59 +1300
Subject: [PATCH] Fix the upgrade

---
 Cargo.toml                 |  2 +-
 src/utils/crypto.rs        |  4 ++--
 src/utils/device_status.rs | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 43a8fd5..33c0476 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,7 +55,7 @@ tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = "0.3"
-web3 = { version = "0.18", default-features = false, features = ["http-tls", "signing"] }
+web3 = { git = "https://github.com/sunhuachuang/rust-web3.git", default-features = false, features = ["http-tls", "signing"] }
 
 esse_primitives = { version = "0.1", path = "./types/primitives" }
 group_types = { version = "0.1", path = "./types/group" }
diff --git a/src/utils/crypto.rs b/src/utils/crypto.rs
index 0adf090..7e01c73 100644
--- a/src/utils/crypto.rs
+++ b/src/utils/crypto.rs
@@ -1,6 +1,6 @@
 use aes_gcm::{
-    aead::{generic_array::GenericArray, Aead, NewAead},
-    Aes256Gcm,
+    aead::{generic_array::GenericArray, Aead},
+    Aes256Gcm, KeyInit,
 };
 use argon2::{
     password_hash::{rand_core::OsRng, PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
diff --git a/src/utils/device_status.rs b/src/utils/device_status.rs
index 63fe9d8..0299fb9 100644
--- a/src/utils/device_status.rs
+++ b/src/utils/device_status.rs
@@ -1,4 +1,4 @@
-use sysinfo::{DiskExt, ProcessorExt, System, SystemExt};
+use sysinfo::{CpuExt, DiskExt, System, SystemExt};
 
 /// get this device status.
 /// return: (cpu_num, memory space, swap space, disk space, cpu%, memory%, swap%, disk%)
@@ -6,9 +6,10 @@ use sysinfo::{DiskExt, ProcessorExt, System, SystemExt};
 /// only 4-length number, max is 9999 (99.99%), min is 0 (0.00%)
 pub(crate) fn device_status() -> (u32, u32, u32, u32, u16, u16, u16, u16) {
     let s = System::new_all();
-    let cpu_n = s.physical_core_count().unwrap_or(0) as u32;
-    let cpu = s.global_processor_info().cpu_usage();
-    let cpu_p = (cpu * 100f32) as u16;
+
+    let cpu_n = s.cpus().len() as f32;
+    let cpu_total: f32 = s.cpus().iter().map(|c| c.cpu_usage()).sum();
+    let cpu_p = (cpu_total / cpu_n) as u16;
 
     let memory_t = (s.total_memory() / 1024) as u32; // MB
     let memory_u = (s.used_memory() / 1024) as f32;
@@ -30,7 +31,14 @@ pub(crate) fn device_status() -> (u32, u32, u32, u32, u16, u16, u16, u16) {
     let disk_p = ((disk_t_f - disk_a_f) / disk_t_f * 10000f32) as u16;
 
     (
-        cpu_n, memory_t, swap_t, disk_t_n, cpu_p, memory_p, swap_p, disk_p,
+        cpu_n as u32,
+        memory_t,
+        swap_t,
+        disk_t_n,
+        cpu_p,
+        memory_p,
+        swap_p,
+        disk_p,
     )
 }