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

Use custom type for ProtocolName (#5963)

Browse Source 
* Use new ProtocolName in peer_set.rs

* Use new ProtocolName for request-response protocols

* Use new ProtocolName in polkadot-network-bridge

* Import and conversion fixes

* Use ProtocolName re-exported in sc_network

* update lockfile for {"substrate"}

Co-authored-by: parity-processbot <>
This commit is contained in:
Dmitry Markin
2022-09-04 01:02:01 +03:00
committed by GitHub
parent 3bbfc46d5d
commit b3480bd51f
7 changed files with 224 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/network/bridge/src/network.rs
+10 -9
View File
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use std::{borrow::Cow, collections::HashSet, sync::Arc};
use std::{collections::HashSet, sync::Arc};
use async_trait::async_trait;
use futures::{prelude::*, stream::BoxStream};
@@ -27,6 +27,7 @@ use sc_network::{
};
use sc_network_common::{
config::parse_addr,
protocol::ProtocolName,
service::{NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest},
};
@@ -92,12 +93,12 @@ pub trait Network: Clone + Send + 'static {
/// Note that `out_peers` setting has no effect on this.
async fn set_reserved_peers(
&mut self,
protocol: Cow<'static, str>,
protocol: ProtocolName,
multiaddresses: HashSet<Multiaddr>,
) -> Result<(), String>;
/// Removes the peers for the protocol's peer set (both reserved and non-reserved).
async fn remove_from_peers_set(&mut self, protocol: Cow<'static, str>, peers: Vec<PeerId>);
async fn remove_from_peers_set(&mut self, protocol: ProtocolName, peers: Vec<PeerId>);
/// Send a request to a remote peer.
async fn start_request<AD: AuthorityDiscovery>(
@@ -112,10 +113,10 @@ pub trait Network: Clone + Send + 'static {
fn report_peer(&self, who: PeerId, cost_benefit: Rep);
/// Disconnect a given peer from the protocol specified without harming reputation.
fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>);
fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName);
/// Write a notification to a peer on the given protocol.
fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>);
fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>);
}
#[async_trait]
@@ -126,13 +127,13 @@ impl Network for Arc<NetworkService<Block, Hash>> {
async fn set_reserved_peers(
&mut self,
protocol: Cow<'static, str>,
protocol: ProtocolName,
multiaddresses: HashSet<Multiaddr>,
) -> Result<(), String> {
NetworkService::set_reserved_peers(&**self, protocol, multiaddresses)
}
async fn remove_from_peers_set(&mut self, protocol: Cow<'static, str>, peers: Vec<PeerId>) {
async fn remove_from_peers_set(&mut self, protocol: ProtocolName, peers: Vec<PeerId>) {
NetworkService::remove_peers_from_reserved_set(&**self, protocol, peers);
}
@@ -140,11 +141,11 @@ impl Network for Arc<NetworkService<Block, Hash>> {
NetworkService::report_peer(&**self, who, cost_benefit.into_base_rep());
}
fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>) {
fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName) {
NetworkService::disconnect_peer(&**self, who, protocol);
}
fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>) {
NetworkService::write_notification(&**self, who, protocol, message);
}
polkadot/node/network/bridge/src/rx/tests.rs
+5 -6
View File
@@ -23,12 +23,11 @@ use assert_matches::assert_matches;
use async_trait::async_trait;
use parking_lot::Mutex;
use std::{
borrow::Cow,
collections::HashSet,
sync::atomic::{AtomicBool, Ordering},
};
use sc_network::{Event as NetworkEvent, IfDisconnected};
use sc_network::{Event as NetworkEvent, IfDisconnected, ProtocolName};
use polkadot_node_network_protocol::{
peer_set::PeerSetProtocolNames,
@@ -112,13 +111,13 @@ impl Network for TestNetwork {
async fn set_reserved_peers(
&mut self,
_protocol: Cow<'static, str>,
_protocol: ProtocolName,
_: HashSet<Multiaddr>,
) -> Result<(), String> {
Ok(())
}
async fn remove_from_peers_set(&mut self, _protocol: Cow<'static, str>, _: Vec<PeerId>) {}
async fn remove_from_peers_set(&mut self, _protocol: ProtocolName, _: Vec<PeerId>) {}
async fn start_request<AD: AuthorityDiscovery>(
&self,
@@ -136,7 +135,7 @@ impl Network for TestNetwork {
.unwrap();
}
fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>) {
fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName) {
let (peer_set, version) = self.protocol_names.try_get_protocol(&protocol).unwrap();
assert_eq!(version, peer_set.get_main_version());
@@ -146,7 +145,7 @@ impl Network for TestNetwork {
.unwrap();
}
fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>) {
let (peer_set, version) = self.protocol_names.try_get_protocol(&protocol).unwrap();
assert_eq!(version, peer_set.get_main_version());
polkadot/node/network/bridge/src/tx/tests.rs
+6 -6
View File
@@ -20,9 +20,9 @@ use polkadot_node_subsystem_util::TimeoutExt;
use async_trait::async_trait;
use parking_lot::Mutex;
use std::{borrow::Cow, collections::HashSet};
use std::collections::HashSet;
use sc_network::{Event as NetworkEvent, IfDisconnected};
use sc_network::{Event as NetworkEvent, IfDisconnected, ProtocolName};
use polkadot_node_network_protocol::{
peer_set::PeerSetProtocolNames,
@@ -99,13 +99,13 @@ impl Network for TestNetwork {
async fn set_reserved_peers(
&mut self,
_protocol: Cow<'static, str>,
_protocol: ProtocolName,
_: HashSet<Multiaddr>,
) -> Result<(), String> {
Ok(())
}
async fn remove_from_peers_set(&mut self, _protocol: Cow<'static, str>, _: Vec<PeerId>) {}
async fn remove_from_peers_set(&mut self, _protocol: ProtocolName, _: Vec<PeerId>) {}
async fn start_request<AD: AuthorityDiscovery>(
&self,
@@ -123,7 +123,7 @@ impl Network for TestNetwork {
.unwrap();
}
fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>) {
fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName) {
let (peer_set, version) = self.peerset_protocol_names.try_get_protocol(&protocol).unwrap();
assert_eq!(version, peer_set.get_main_version());
@@ -133,7 +133,7 @@ impl Network for TestNetwork {
.unwrap();
}
fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>) {
let (peer_set, version) = self.peerset_protocol_names.try_get_protocol(&protocol).unwrap();
assert_eq!(version, peer_set.get_main_version());
polkadot/node/network/bridge/src/validator_discovery.rs
+6 -13
View File
@@ -174,12 +174,9 @@ mod tests {
PeerId,
};
use polkadot_primitives::v2::Hash;
use sc_network::{Event as NetworkEvent, IfDisconnected};
use sc_network::{Event as NetworkEvent, IfDisconnected, ProtocolName};
use sp_keyring::Sr25519Keyring;
use std::{
borrow::Cow,
collections::{HashMap, HashSet},
};
use std::collections::{HashMap, HashSet};
fn new_service() -> Service<TestNetwork, TestAuthorityDiscovery> {
let genesis_hash = Hash::repeat_byte(0xff);
@@ -232,18 +229,14 @@ mod tests {
async fn set_reserved_peers(
&mut self,
_protocol: Cow<'static, str>,
_protocol: ProtocolName,
multiaddresses: HashSet<Multiaddr>,
) -> Result<(), String> {
self.peers_set = extract_peer_ids(multiaddresses.into_iter());
Ok(())
}
async fn remove_from_peers_set(
&mut self,
_protocol: Cow<'static, str>,
peers: Vec<PeerId>,
) {
async fn remove_from_peers_set(&mut self, _protocol: ProtocolName, peers: Vec<PeerId>) {
self.peers_set.retain(|elem| !peers.contains(elem));
}
@@ -260,11 +253,11 @@ mod tests {
panic!()
}
fn disconnect_peer(&self, _: PeerId, _: Cow<'static, str>) {
fn disconnect_peer(&self, _: PeerId, _: ProtocolName) {
panic!()
}
fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
fn write_notification(&self, _: PeerId, _: ProtocolName, _: Vec<u8>) {
panic!()
}
}