Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

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

Merged
tomaka merged 8 commits into from
Apr 8, 2020
Merged

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

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
889d515
Companion PR to #5560
tomaka Apr 7, 2020
a28fb92
Set priorities.
tomusdrw Apr 8, 2020
e673fba
Update substrate.
tomusdrw Apr 8, 2020
4a566b2
Fix tests.
tomusdrw Apr 8, 2020
a9579df
Update Substrate
tomaka Apr 8, 2020
739862b
Companion of SignedExtension refactor (#5540)
athei Apr 7, 2020
7901ea3
Merge remote-tracking branch 'upstream/at-refactor-signed-extension' …
tomaka Apr 8, 2020
523f369
Merge remote-tracking branch 'upstream/td-unsigned-priority-companion…
tomaka Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions network/test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
}

Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down