From cddfa7b347d1948e4a030b4c4a3372cef77d5190 Mon Sep 17 00:00:00 2001 From: Revertron Date: Fri, 2 Apr 2021 20:05:46 +0200 Subject: [PATCH] Updated some dependencies. --- Cargo.toml | 14 +++++++------- src/p2p/network.rs | 7 ++++--- src/web_ui.rs | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c974340..f40ed92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,25 +16,25 @@ simple_logger = "1.11.0" toml = "0.5.8" digest = "0.9.0" sha2 = "0.9.3" -ed25519-dalek = "1.0.1" +ed25519-dalek = "1.0" signature = "1.3.0" blakeout = "0.3.0" num_cpus = "1.13.0" byteorder = "1.4.3" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.64" -num-bigint = "0.4.0" +num-bigint = "0.4" num-traits = "0.2.14" -chrono = { version = "0.4.13", features = ["serde"] } +chrono = { version = "0.4", features = ["serde"] } rand = "0.8.3" rand-old = { package = "rand", version = "0.7.0" } # For ed25519-dalek sqlite = "0.26.0" uuid = { version = "0.8.2", features = ["serde", "v4"] } -mio = { version = "0.7.10", features = ["os-poll", "net"] } -derive_more = "0.99.9" # for DNS from hermes +mio = { version = "0.7", features = ["os-poll", "net"] } +derive_more = "0.99" # for DNS from hermes # Optional dependencies regulated by features -web-view = { version = "0.7.3", features = [], optional = true } +web-view = { version = "0.7", features = [], optional = true } tinyfiledialogs = { version = "3.3.10", optional = true } [target.'cfg(windows)'.dependencies] diff --git a/src/p2p/network.rs b/src/p2p/network.rs index 40a2b50..17d5501 100644 --- a/src/p2p/network.rs +++ b/src/p2p/network.rs @@ -338,7 +338,7 @@ fn handle_message(context: Arc>, message: Message, peers: &mut Pe // TODO cache it somewhere (context.chain.height(), context.chain.last_hash(), &context.settings.origin.clone(), CHAIN_VERSION) }; - match message { + let answer = match message { Message::Hand { app_version, origin, version, public, rand} => { debug!("Hello from v{}", &app_version); if peers.is_our_own_connect(&rand) { @@ -446,7 +446,7 @@ fn handle_message(context: Arc>, message: Message, peers: &mut Pe } let context = Arc::clone(&context); let peers_count = peers.get_peers_active_count(); - thread::spawn(move || { + let _ = thread::Builder::new().name(String::from("Message::Block")).spawn(move || { let mut context = context.lock().unwrap(); let max_height = context.chain.max_height(); match context.chain.check_new_block(&block) { @@ -475,7 +475,8 @@ fn handle_message(context: Arc>, message: Message, peers: &mut Pe }); State::idle() } - } + }; + answer } /// Sends an Event to miner to start mining locker block if "locker" is our public key diff --git a/src/web_ui.rs b/src/web_ui.rs index 8bc789a..829c848 100644 --- a/src/web_ui.rs +++ b/src/web_ui.rs @@ -184,7 +184,7 @@ fn action_loaded(context: &Arc>, web_view: &mut WebView<()>) { let status = Arc::clone(&status); let handle = handle.clone(); let context_copy = Arc::clone(&context_copy); - thread::spawn(move || { + let _ = thread::Builder::new().name(String::from("webui")).spawn(move || { let mut status = status.lock().unwrap(); let context = context_copy.lock().unwrap(); let eval = match e {