From 6921b2ce3db57339129a0883870771e3cf4c5190 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 3 May 2019 16:00:47 +0200
Subject: [PATCH] tokio -> tokio-timer in consensus (#2460)
---
substrate/Cargo.lock | 2 +-
substrate/core/consensus/common/Cargo.toml | 4 ++--
substrate/core/consensus/common/src/error.rs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 90761c38076..e5382f07d3d 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -3995,7 +3995,7 @@ dependencies = [
"substrate-inherents 1.0.0",
"substrate-primitives 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]]
diff --git a/substrate/core/consensus/common/Cargo.toml b/substrate/core/consensus/common/Cargo.toml
index dab38788632..728c25ccc84 100644
--- a/substrate/core/consensus/common/Cargo.toml
+++ b/substrate/core/consensus/common/Cargo.toml
@@ -15,7 +15,7 @@ error-chain = "0.12"
futures = "0.1"
runtime_version = { package = "sr-version", path = "../../sr-version" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
-tokio = "0.1.7"
+tokio-timer = "0.2"
parity-codec = { version = "3.3", features = ["derive"] }
[dev-dependencies]
@@ -23,4 +23,4 @@ test_client = { package = "substrate-test-client", path = "../../test-client" }
[features]
default = []
-test-helpers = []
\ No newline at end of file
+test-helpers = []
diff --git a/substrate/core/consensus/common/src/error.rs b/substrate/core/consensus/common/src/error.rs
index 0f1914087bf..f338dc9ce40 100644
--- a/substrate/core/consensus/common/src/error.rs
+++ b/substrate/core/consensus/common/src/error.rs
@@ -35,7 +35,7 @@ error_chain! {
}
/// Unable to schedule wakeup.
- FaultyTimer(e: ::tokio::timer::Error) {
+ FaultyTimer(e: ::tokio_timer::Error) {
description("Timer error"),
display("Timer error: {}", e),
}
--
GitLab