Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Moved StopGaurd to it's own crate #7635

Merged
merged 1 commit into from
Jan 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions devtools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ extern crate rand;

mod random_path;
mod test_socket;
mod stop_guard;
pub mod http_client;

pub use random_path::*;
pub use test_socket::*;
pub use stop_guard::*;
1 change: 1 addition & 0 deletions ethcore/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
kvdb-memorydb = { path = "../util/kvdb-memorydb" }
util-error = { path = "../util/error" }
snappy = { git = "https://github.com/paritytech/rust-snappy" }
stop-guard = { path = "../util/stop-guard" }
migration = { path = "../util/migration" }
macros = { path = "../util/macros" }
rust-crypto = "0.2.34"
Expand Down
1 change: 1 addition & 0 deletions ethcore/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ extern crate migration;
extern crate rlp_derive;
extern crate rustc_hex;
extern crate stats;
extern crate stop_guard;
extern crate time;
extern crate using_queue;
extern crate table;
Expand Down
5 changes: 3 additions & 2 deletions ethcore/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use miner::Miner;
use snapshot::{ManifestData, RestorationStatus};
use snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams};
use ansi_term::Colour;
use stop_guard::StopGuard;

/// Message type for external and internal events
#[derive(Clone, PartialEq, Eq, Debug)]
Expand Down Expand Up @@ -59,7 +60,7 @@ pub struct ClientService {
client: Arc<Client>,
snapshot: Arc<SnapshotService>,
database: Arc<Database>,
_stop_guard: ::devtools::StopGuard,
_stop_guard: StopGuard,
}

impl ClientService {
Expand Down Expand Up @@ -111,7 +112,7 @@ impl ClientService {

spec.engine.register_client(Arc::downgrade(&client) as _);

let stop_guard = ::devtools::StopGuard::new();
let stop_guard = StopGuard::new();

Ok(ClientService {
io_service: Arc::new(io_service),
Expand Down
6 changes: 6 additions & 0 deletions util/stop-guard/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "stop-guard"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]

[dependencies]
File renamed without changes.