Unverified Commit f570356d authored by Gavin Wood's avatar Gavin Wood Committed by GitHub
Browse files

Bump Substrate & versions (#747)

* Bump versions

* Update for tipping treasury

* Bump substrate

* Fixes

* Put send_consensus back in.

* Fix test

* Fixes

* Fixes

* Fix warning
parent c003d73c
Pipeline #74125 passed with stages
in 21 minutes and 46 seconds
[package] [package]
name = "polkadot-service" name = "polkadot-service"
version = "0.7.16" version = "0.7.17"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
...@@ -280,11 +280,7 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration) ...@@ -280,11 +280,7 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
Extrinsic: RuntimeExtrinsic, Extrinsic: RuntimeExtrinsic,
{ {
use sc_network::Event; use sc_network::Event;
use futures01::Stream; use futures::stream::StreamExt;
use futures::{
compat::Stream01CompatExt,
stream::StreamExt,
};
let is_collator = config.custom.collating_for.is_some(); let is_collator = config.custom.collating_for.is_some();
let is_authority = config.roles.is_authority() && !is_collator; let is_authority = config.roles.is_authority() && !is_collator;
...@@ -436,19 +432,16 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration) ...@@ -436,19 +432,16 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
if authority_discovery_enabled { if authority_discovery_enabled {
let network = service.network(); 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), Event::Dht(e) => Some(e),
_ => None, _ => None,
}); }}).boxed();
let future03_dht_event_stream = dht_event_stream.compat()
.map(|x| x.expect("<mpsc::channel::Receiver as Stream> never returns an error; qed"))
.boxed();
let authority_discovery = authority_discovery::AuthorityDiscovery::new( let authority_discovery = authority_discovery::AuthorityDiscovery::new(
service.client(), service.client(),
network, network,
sentry_nodes, sentry_nodes,
service.keystore(), service.keystore(),
future03_dht_event_stream, dht_event_stream,
); );
let future01_authority_discovery = authority_discovery.map(|x| Ok(x)).compat(); let future01_authority_discovery = authority_discovery.map(|x| Ok(x)).compat();
......
[package] [package]
name = "polkadot-statement-table" name = "polkadot-statement-table"
version = "0.7.16" version = "0.7.17"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "adder" name = "adder"
version = "0.7.16" version = "0.7.17"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition" description = "Test parachain which adds to a number as its state transition"
edition = "2018" edition = "2018"
......
[package] [package]
name = "halt" name = "halt"
version = "0.7.16" version = "0.7.17"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which executes forever" description = "Test parachain which executes forever"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-validation" name = "polkadot-validation"
version = "0.7.16" version = "0.7.17"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment