Use async/await instead of manual polling of NetworkWorker

client/authority-discovery/src/worker/tests.rs

@@ -184,6 +184,10 @@ impl NetworkStateInfo for TestNetwork {
 	fn external_addresses(&self) -> Vec<Multiaddr> {
 		self.external_addresses.clone()
 	}
+
+	fn listen_addresses(&self) -> Vec<Multiaddr> {
+		self.external_addresses.clone()
+	}
 }
 
 struct TestSigner<'a> {

client/finality-grandpa/src/communication/mod.rs

@@ -167,7 +167,7 @@ const TELEMETRY_VOTERS_LIMIT: usize = 10;
 /// well as the ability to set a fork sync request for a particular block.
 pub trait Network<Block: BlockT>:
 	NetworkSyncForkRequest<Block::Hash, NumberFor<Block>>
-	+ NetworkBlock<Block::Hash, NumberFor<Block>>
+	+ NetworkBlock<Block::Hash, NumberFor<Block>, Block::Header>
 	+ GossipNetwork<Block>
 	+ Clone
 	+ Send
@@ -179,7 +179,7 @@ impl<Block, T> Network<Block> for T
 where
 	Block: BlockT,
 	T: NetworkSyncForkRequest<Block::Hash, NumberFor<Block>>
-		+ NetworkBlock<Block::Hash, NumberFor<Block>>
+		+ NetworkBlock<Block::Hash, NumberFor<Block>, Block::Header>
 		+ GossipNetwork<Block>
 		+ Clone
 		+ Send

client/finality-grandpa/src/communication/tests.rs

@@ -35,7 +35,7 @@ use sc_network_common::{
 	},
 };
 use sc_network_gossip::Validator;
-use sc_network_test::{Block, Hash};
+use sc_network_test::{Block, Hash, Header};
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_finality_grandpa::AuthorityList;
 use sp_keyring::Ed25519Keyring;
@@ -155,14 +155,18 @@ impl NetworkNotification for TestNetwork {
 	}
 }
 
-impl NetworkBlock<Hash, NumberFor<Block>> for TestNetwork {
+impl NetworkBlock<Hash, NumberFor<Block>, Header> for TestNetwork {
 	fn announce_block(&self, hash: Hash, _data: Option<Vec<u8>>) {
 		let _ = self.sender.unbounded_send(Event::Announce(hash));
 	}
 
 	fn new_best_block_imported(&self, _hash: Hash, _number: NumberFor<Block>) {
 		unimplemented!();
 	}
+
+	fn on_block_finalized(&self, _hash: Hash, _header: Header) {
+		unimplemented!();
+	}
 }
 
 impl NetworkSyncForkRequest<Hash, NumberFor<Block>> for TestNetwork {

client/network-gossip/src/bridge.rs

@@ -435,7 +435,9 @@ mod tests {
 		}
 	}
 
-	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>> for TestNetwork {
+	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>, <Block as BlockT>::Header>
+		for TestNetwork
+	{
 		fn announce_block(&self, _hash: <Block as BlockT>::Hash, _data: Option<Vec<u8>>) {
 			unimplemented!();
 		}
@@ -447,6 +449,14 @@ mod tests {
 		) {
 			unimplemented!();
 		}
+
+		fn on_block_finalized(
+			&self,
+			_hash: <Block as BlockT>::Hash,
+			_header: <Block as BlockT>::Header,
+		) {
+			unimplemented!();
+		}
 	}
 
 	struct AllowAll;

client/network-gossip/src/lib.rs

@@ -81,7 +81,10 @@ mod validator;
 
 /// Abstraction over a network.
 pub trait Network<B: BlockT>:
-	NetworkPeers + NetworkEventStream + NetworkNotification + NetworkBlock<B::Hash, NumberFor<B>>
+	NetworkPeers
+	+ NetworkEventStream
+	+ NetworkNotification
+	+ NetworkBlock<B::Hash, NumberFor<B>, B::Header>
 {
 	fn add_set_reserved(&self, who: PeerId, protocol: ProtocolName) {
 		let addr =
@@ -97,6 +100,6 @@ impl<T, B: BlockT> Network<B> for T where
 	T: NetworkPeers
 		+ NetworkEventStream
 		+ NetworkNotification
-		+ NetworkBlock<B::Hash, NumberFor<B>>
+		+ NetworkBlock<B::Hash, NumberFor<B>, B::Header>
 {
 }

client/network-gossip/src/state_machine.rs

@@ -677,7 +677,9 @@ mod tests {
 		}
 	}
 
-	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>> for NoOpNetwork {
+	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>, <Block as BlockT>::Header>
+		for NoOpNetwork
+	{
 		fn announce_block(&self, _hash: <Block as BlockT>::Hash, _data: Option<Vec<u8>>) {
 			unimplemented!();
 		}
@@ -689,6 +691,14 @@ mod tests {
 		) {
 			unimplemented!();
 		}
+
+		fn on_block_finalized(
+			&self,
+			_hash: <Block as BlockT>::Hash,
+			_header: <Block as BlockT>::Header,
+		) {
+			unimplemented!();
+		}
 	}
 
 	#[test]

client/network/common/src/service.rs

@@ -180,13 +180,13 @@ pub trait NetworkPeers {
 	/// purposes.
 	fn deny_unreserved_peers(&self);
 
-	/// Adds a `PeerId` and its `Multiaddr` as reserved.
+	/// Adds a `PeerId` and its `Multiaddr` as reserved for a sync protocol (default peer set).
 	///
 	/// Returns an `Err` if the given string is not a valid multiaddress
 	/// or contains an invalid peer ID (which includes the local peer ID).
 	fn add_reserved_peer(&self, peer: MultiaddrWithPeerId) -> Result<(), String>;
 
-	/// Removes a `PeerId` from the list of reserved peers.
+	/// Removes a `PeerId` from the list of reserved peers for a sync protocol (default peer set).
 	fn remove_reserved_peer(&self, peer_id: PeerId);
 
 	/// Sets the reserved set of a protocol to the given set of peers.
@@ -359,6 +359,9 @@ pub trait NetworkStateInfo {
 	/// Returns the local external addresses.
 	fn external_addresses(&self) -> Vec<Multiaddr>;
 
+	/// Returns the listening addresses (without trailing `/p2p/` with our `PeerId`).
+	fn listen_addresses(&self) -> Vec<Multiaddr>;
+
 	/// Returns the local Peer ID.
 	fn local_peer_id(&self) -> PeerId;
 }
@@ -372,6 +375,10 @@ where
 		T::external_addresses(self)
 	}
 
+	fn listen_addresses(&self) -> Vec<Multiaddr> {
+		T::listen_addresses(self)
+	}
+
 	fn local_peer_id(&self) -> PeerId {
 		T::local_peer_id(self)
 	}
@@ -605,7 +612,7 @@ where
 }
 
 /// Provides ability to announce blocks to the network.
-pub trait NetworkBlock<BlockHash, BlockNumber> {
+pub trait NetworkBlock<BlockHash, BlockNumber, BlockHeader> {
 	/// Make sure an important block is propagated to peers.
 	///
 	/// In chain-based consensus, we often need to make sure non-best forks are
@@ -614,12 +621,16 @@ pub trait NetworkBlock<BlockHash, BlockNumber> {
 
 	/// Inform the network service about new best imported block.
 	fn new_best_block_imported(&self, hash: BlockHash, number: BlockNumber);
+
+	/// Notify the network service (and underlying `NetworkSync`) about a finalized block.
+	fn on_block_finalized(&self, hash: BlockHash, header: BlockHeader);
 }
 
-impl<T, BlockHash, BlockNumber> NetworkBlock<BlockHash, BlockNumber> for Arc<T>
+impl<T, BlockHash, BlockNumber, BlockHeader> NetworkBlock<BlockHash, BlockNumber, BlockHeader>
+	for Arc<T>
 where
 	T: ?Sized,
-	T: NetworkBlock<BlockHash, BlockNumber>,
+	T: NetworkBlock<BlockHash, BlockNumber, BlockHeader>,
 {
 	fn announce_block(&self, hash: BlockHash, data: Option<Vec<u8>>) {
 		T::announce_block(self, hash, data)
@@ -628,4 +639,8 @@ where
 	fn new_best_block_imported(&self, hash: BlockHash, number: BlockNumber) {
 		T::new_best_block_imported(self, hash, number)
 	}
+
+	fn on_block_finalized(&self, hash: BlockHash, header: BlockHeader) {
+		T::on_block_finalized(self, hash, header)
+	}
 }