grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deps: switch to upstream ctrlc (#11617)

Browse Source
This commit is contained in:
Andronik Ordian 2020-04-09 18:24:27 +02:00 committed by GitHub
parent a5820b6ef9
commit 51e4a6dcbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Cargo.lock generated
View File

@ -862,12 +862,12 @@ dependencies = [
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "1.1.1" version = "3.1.4"
source = "git+https://github.com/paritytech/rust-ctrlc.git#b523017108bb2d571a7a69bd97bc406e63bc7a9d" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7"
dependencies = [ dependencies = [
"kernel32-sys", "nix",
"libc", "winapi 0.3.8",
"winapi 0.2.8",
] ]
[[package]] [[package]]
@ -2997,6 +2997,19 @@ dependencies = [
"winapi 0.3.8", "winapi 0.3.8",
] ]
[[package]]
name = "nix"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
dependencies = [
"bitflags",
"cc",
"cfg-if",
"libc",
"void",
]
[[package]] [[package]]
name = "node-filter" name = "node-filter"
version = "1.12.0" version = "1.12.0"
@ -5605,6 +5618,12 @@ dependencies = [
"rlp", "rlp",
] ]
[[package]]
name = "void"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "2.3.1" version = "2.3.1"

2
Cargo.toml
View File

@ -17,7 +17,7 @@ clap = "2"
cli-signer= { path = "cli-signer" } cli-signer= { path = "cli-signer" }
client-traits = { path = "ethcore/client-traits" } client-traits = { path = "ethcore/client-traits" }
common-types = { path = "ethcore/types" } common-types = { path = "ethcore/types" }
ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" } ctrlc = { version = "3.1.4", features = ["termination"] }
dir = { path = "util/dir" } dir = { path = "util/dir" }
docopt = "1.0" docopt = "1.0"
engine = { path = "ethcore/engine" } engine = { path = "ethcore/engine" }

5
parity/main.rs
View File

@ -41,7 +41,6 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::{process, env}; use std::{process, env};
use ansi_term::Colour; use ansi_term::Colour;
use ctrlc::CtrlC;
use dir::default_hypervisor_path; use dir::default_hypervisor_path;
use fdlimit::raise_fd_limit; use fdlimit::raise_fd_limit;
use ethcore_logger::setup_log; use ethcore_logger::setup_log;
@ -299,7 +298,7 @@ fn main_direct(force_can_restart: bool) -> i32 {
} }
}); });
CtrlC::set_handler({ ctrlc::set_handler({
let e = exit.clone(); let e = exit.clone();
let exiting = exiting.clone(); let exiting = exiting.clone();
move || { move || {
@ -313,7 +312,7 @@ fn main_direct(force_can_restart: bool) -> i32 {
e.1.notify_all(); e.1.notify_all();
} }
} }
}); }).expect("Error setting Ctrl-C handler");
// so the client has started successfully // so the client has started successfully
// if this is a daemon, detach from the parent process // if this is a daemon, detach from the parent process