Update to latest Substrate master (#783)

* Update to latest Substrate master

* Update wasm-builder and make `run` work
This commit is contained in:
Bastian Köcher
2020-01-22 12:27:28 +01:00
committed by GitHub
parent 5b129f1292
commit e6f4c36ed9
11 changed files with 377 additions and 434 deletions
+3 -3
View File
@@ -21,7 +21,7 @@ pub mod chain_spec;
use futures::{
FutureExt, TryFutureExt,
task::{Spawn, SpawnError, FutureObj},
compat::{Future01CompatExt, Stream01CompatExt},
compat::Future01CompatExt,
};
use sc_client::LongestChain;
use std::sync::Arc;
@@ -455,9 +455,9 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
if authority_discovery_enabled {
let network = service.network();
let network_event_stream = network.event_stream().compat();
let network_event_stream = network.event_stream();
let dht_event_stream = network_event_stream.filter_map(|e| async move { match e {
Ok(Event::Dht(e)) => Some(e),
Event::Dht(e) => Some(e),
_ => None,
}}).boxed();
let authority_discovery = authority_discovery::AuthorityDiscovery::new(