Companion PR to #5560 - Also includes polkadot#979 and polkadot#986 (#982)

* Companion PR to #5560

* Set priorities.

* Update substrate.

* Fix tests.

* Update Substrate

* Companion of SignedExtension refactor (#5540)

Co-authored-by: Tomasz Drwięga <tomasz@parity.io>
Co-authored-by: Alexander Theißen <alexander.theissen@parity.io>
This commit is contained in:
Pierre Krieger
2020-04-08 16:12:28 +02:00
committed by GitHub
parent 335961c520
commit 75ebe7fb2e
7 changed files with 302 additions and 357 deletions
+4 -4
View File
@@ -43,7 +43,7 @@ use sp_consensus::block_import::{BlockImport, ImportResult};
use sp_consensus::Error as ConsensusError;
use sp_consensus::{BlockOrigin, BlockImportParams, BlockCheckParams, JustificationImport};
use futures::prelude::*;
use sc_network::{NetworkWorker, NetworkStateInfo, NetworkService, ReportHandle, config::ProtocolId};
use sc_network::{NetworkWorker, NetworkService, ReportHandle, config::ProtocolId};
use sc_network::config::{NetworkConfiguration, TransportConfig, BoxFinalityProofRequestBuilder};
use parking_lot::Mutex;
use sp_core::H256;
@@ -157,7 +157,7 @@ pub struct Peer<D> {
impl<D> Peer<D> {
/// Get this peer ID.
pub fn id(&self) -> PeerId {
pub fn id(&self) -> &PeerId {
self.network.service().local_peer_id()
}
@@ -597,7 +597,7 @@ pub trait TestNetFactory: Sized {
self.mut_peers(|peers| {
for peer in peers.iter_mut() {
peer.network.add_known_address(network.service().local_peer_id(), listen_addr.clone());
peer.network.add_known_address(network.service().local_peer_id().clone(), listen_addr.clone());
}
let imported_blocks_stream = Box::pin(client.import_notification_stream().fuse());
@@ -672,7 +672,7 @@ pub trait TestNetFactory: Sized {
self.mut_peers(|peers| {
for peer in peers.iter_mut() {
peer.network.add_known_address(network.service().local_peer_id(), listen_addr.clone());
peer.network.add_known_address(network.service().local_peer_id().clone(), listen_addr.clone());
}
let imported_blocks_stream = Box::pin(client.import_notification_stream().fuse());