pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 23:51:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove tokio dependencies (#2935)

Browse Source 
* Remove dependencies on tokio

* Make service not depend on tokio

* Fix service tests

* Manually poll the import queue if failed to start

* Spawn all tasks at the end

* Remove executor from TelemetryOnConnect

* Remove TaskExecutor from offchain workers

* Remove TaskExecutor from AuthoritySetup

* Remove TaskExecutor from service

* Remove tokio dependency from RPC

* Remove finality-grandpa from WASM checks

* Fix offchain tests

* Line widths

* Fix RPC tests

* Fix service tests

* Fix bad futures polling

* Address some concerns

* Better error handling

* Is it the connectivity test that's not passing? I don't know, let's try

* Revert "Is it the connectivity test that's not passing? I don't know, let's try"

This reverts commit 28bbe51f0e2e4885fe1f901e11078604604cb212.

* Fix test
This commit is contained in:
Pierre Krieger
2019-06-26 17:21:17 +02:00
committed by Bastian Köcher
parent f69c48c7b8
commit 1b73b6532a
26 changed files with 287 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/service/test/src/lib.rs
+21 -5
View File
@@ -22,12 +22,14 @@ use std::net::Ipv4Addr;
use std::time::Duration;
use std::collections::HashMap;
use log::info;
use futures::{Future, Stream};
use futures::{Future, Stream, Poll};
use tempdir::TempDir;
use tokio::{runtime::Runtime, prelude::FutureExt};
use tokio::timer::Interval;
use service::{
Service,
ServiceFactory,
Components,
Configuration,
FactoryFullConfiguration,
FactoryChainSpec,
@@ -52,6 +54,17 @@ struct TestNet<F: ServiceFactory> {
nodes: usize,
}
/// Wraps around an `Arc<Service>>` and implements `Future`.
struct ArcService<T>(Arc<T>);
impl<T, C: Components> Future for ArcService<T> where T: std::ops::Deref<Target = Service<C>> {
type Item = ();
type Error = ();
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
Future::poll(&mut &**self.0)
}
}
impl<F: ServiceFactory> TestNet<F> {
pub fn run_until_all_full<FP, LP>(
&mut self,
@@ -186,8 +199,9 @@ impl<F: ServiceFactory> TestNet<F> {
self.authority_nodes.extend(authorities.iter().enumerate().map(|(index, key)| {
let node_config = node_config::<F>(index as u32, &spec, Roles::AUTHORITY, Some(key.clone()), base_port, &temp);
let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
let service = Arc::new(F::new_full(node_config, executor.clone())
let service = Arc::new(F::new_full(node_config)
.expect("Error creating test node service"));
executor.spawn(ArcService(service.clone()));
let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().into()));
((index + nodes) as u32, service, addr)
}));
@@ -196,8 +210,9 @@ impl<F: ServiceFactory> TestNet<F> {
self.full_nodes.extend((nodes..nodes + full as usize).map(|index| {
let node_config = node_config::<F>(index as u32, &spec, Roles::FULL, None, base_port, &temp);
let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
let service = Arc::new(F::new_full(node_config, executor.clone())
let service = Arc::new(F::new_full(node_config)
.expect("Error creating test node service"));
executor.spawn(ArcService(service.clone()));
let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().into()));
(index as u32, service, addr)
}));
@@ -206,8 +221,9 @@ impl<F: ServiceFactory> TestNet<F> {
self.light_nodes.extend((nodes..nodes + light as usize).map(|index| {
let node_config = node_config::<F>(index as u32, &spec, Roles::LIGHT, None, base_port, &temp);
let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
let service = Arc::new(F::new_light(node_config, executor.clone())
let service = Arc::new(F::new_light(node_config)
.expect("Error creating test node service"));
executor.spawn(ArcService(service.clone()));
let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().into()));
(index as u32, service, addr)
}));
@@ -247,7 +263,7 @@ pub fn connectivity<F: ServiceFactory>(spec: FactoryChainSpec<F>) {
network.runtime
};
runtime.shutdown_on_idle().wait().expect("Error shutting down runtime");
runtime.shutdown_now().wait().expect("Error shutting down runtime");
temp.close().expect("Error removing temp dir");
}