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

Bump Substrate & versions (#747)

Browse Source 
* Bump versions

* Update for tipping treasury

* Bump substrate

* Fixes

* Put send_consensus back in.

* Fix test

* Fixes

* Fixes

* Fix warning
This commit is contained in:
Gavin Wood
2020-01-10 00:23:43 +01:00
committed by GitHub
parent affd6e7225
commit ddce5fe496
26 changed files with 668 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/service/src/lib.rs
+4 -11
View File
@@ -280,11 +280,7 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
Extrinsic: RuntimeExtrinsic,
{
use sc_network::Event;
use futures01::Stream;
use futures::{
compat::Stream01CompatExt,
stream::StreamExt,
};
use futures::stream::StreamExt;
let is_collator = config.custom.collating_for.is_some();
let is_authority = config.roles.is_authority() && !is_collator;
@@ -436,19 +432,16 @@ 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| match e {
let dht_event_stream = network.event_stream().filter_map(|e| async move { match e {
Event::Dht(e) => Some(e),
_ => None,
});
let future03_dht_event_stream = dht_event_stream.compat()
.map(|x| x.expect("<mpsc::channel::Receiver as Stream> never returns an error; qed"))
.boxed();
}}).boxed();
let authority_discovery = authority_discovery::AuthorityDiscovery::new(
service.client(),
network,
sentry_nodes,
service.keystore(),
future03_dht_event_stream,
dht_event_stream,
);
let future01_authority_discovery = authority_discovery.map(|x| Ok(x)).compat();