From 14cf3142d35a68a794ea969b6cec91456a12031f Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Tue, 6 Aug 2019 11:36:06 +0200 Subject: [PATCH] Remove tokio dependency from networking and service (#351) * Remove tokio dependency from networking * Also remove tokio from service * Finally fix tests --- polkadot/Cargo.lock | 2 -- polkadot/network/Cargo.toml | 1 - polkadot/network/src/tests/validation.rs | 1 - polkadot/service/Cargo.toml | 1 - 4 files changed, 5 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index a7e9516b0b..bc6552efd1 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -2483,7 +2483,6 @@ dependencies = [ "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2597,7 +2596,6 @@ dependencies = [ "substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml index 692638cb73..5aff3ec486 100644 --- a/polkadot/network/Cargo.toml +++ b/polkadot/network/Cargo.toml @@ -16,7 +16,6 @@ substrate-network = { git = "https://github.com/paritytech/substrate", branch = substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } futures = "0.1" -tokio = "0.1.7" log = "0.4" exit-future = "0.1.4" diff --git a/polkadot/network/src/tests/validation.rs b/polkadot/network/src/tests/validation.rs index ee32b16369..78a362ca81 100644 --- a/polkadot/network/src/tests/validation.rs +++ b/polkadot/network/src/tests/validation.rs @@ -41,7 +41,6 @@ use sr_primitives::traits::{ApiRef, ProvideRuntimeApi}; use std::collections::HashMap; use std::sync::Arc; use futures::{prelude::*, sync::mpsc}; -use tokio::runtime::Runtime; use parity_codec::Encode; use super::TestContext; diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml index 5a801a23e2..d7e091d70a 100644 --- a/polkadot/service/Cargo.toml +++ b/polkadot/service/Cargo.toml @@ -9,7 +9,6 @@ parking_lot = "0.7.1" lazy_static = "1.0" log = "0.4.6" slog = "^2" -tokio = "0.1.7" hex-literal = "0.2" av_store = { package = "polkadot-availability-store", path = "../availability-store" } consensus = { package = "polkadot-validation", path = "../validation" }