v0.17.18: Update latest substrate (#776)

* update latest substrate polkadot-master

* fix test compilation

* bump version to 0.7.18

* bump impl_version

* update substrate

* Revert "Instantiate environment with asynchronous API (#768)"

This reverts commit a5d9645bf4.

* update substrate

* remove unused parameter type

* bump trie-db version for tests

* fix collator test

* update substrate

* remove unnecessary service changes

polkadot/service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-service"
-version = "0.7.17"
+version = "0.7.18"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 

polkadot/service/src/lib.rs

@@ -21,7 +21,7 @@ pub mod chain_spec;
 use futures::{
 	FutureExt, TryFutureExt,
 	task::{Spawn, SpawnError, FutureObj},
-	compat::Future01CompatExt,
+	compat::{Future01CompatExt, Stream01CompatExt},
 };
 use sc_client::LongestChain;
 use std::sync::Arc;
@@ -455,8 +455,9 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
 
 		if authority_discovery_enabled {
 			let network = service.network();
-			let dht_event_stream = network.event_stream().filter_map(|e| async move { match e {
-				Event::Dht(e) => Some(e),
+			let network_event_stream = network.event_stream().compat();
+			let dht_event_stream = network_event_stream.filter_map(|e| async move { match e {
+				Ok(Event::Dht(e)) => Some(e),
 				_ => None,
 			}}).boxed();
 			let authority_discovery = authority_discovery::AuthorityDiscovery::new(