Skip to content
Snippets Groups Projects
Commit 6921b2ce authored by Pierre Krieger's avatar Pierre Krieger Committed by asynchronous rob
Browse files

tokio -> tokio-timer in consensus (#2460)

parent 52472238
Branches
No related merge requests found
...@@ -3995,7 +3995,7 @@ dependencies = [ ...@@ -3995,7 +3995,7 @@ dependencies = [
"substrate-inherents 1.0.0", "substrate-inherents 1.0.0",
"substrate-primitives 1.0.0", "substrate-primitives 1.0.0",
"substrate-test-client 1.0.0", "substrate-test-client 1.0.0",
"tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
......
...@@ -15,7 +15,7 @@ error-chain = "0.12" ...@@ -15,7 +15,7 @@ error-chain = "0.12"
futures = "0.1" futures = "0.1"
runtime_version = { package = "sr-version", path = "../../sr-version" } runtime_version = { package = "sr-version", path = "../../sr-version" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
tokio = "0.1.7" tokio-timer = "0.2"
parity-codec = { version = "3.3", features = ["derive"] } parity-codec = { version = "3.3", features = ["derive"] }
[dev-dependencies] [dev-dependencies]
...@@ -23,4 +23,4 @@ test_client = { package = "substrate-test-client", path = "../../test-client" } ...@@ -23,4 +23,4 @@ test_client = { package = "substrate-test-client", path = "../../test-client" }
[features] [features]
default = [] default = []
test-helpers = [] test-helpers = []
\ No newline at end of file
...@@ -35,7 +35,7 @@ error_chain! { ...@@ -35,7 +35,7 @@ error_chain! {
} }
/// Unable to schedule wakeup. /// Unable to schedule wakeup.
FaultyTimer(e: ::tokio::timer::Error) { FaultyTimer(e: ::tokio_timer::Error) {
description("Timer error"), description("Timer error"),
display("Timer error: {}", e), display("Timer error: {}", e),
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment