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

Replace NodeIndex with PeerId everywhere (#2077)

Browse Source 
* Replace NodeIndex with PeerId

* Fix tests

* More test fixing

* Whitespace
This commit is contained in:
Pierre Krieger
2019-03-23 10:34:28 +01:00
committed by Arkadiy Paronyan
parent 6fa40ec199
commit 6e394464b8
20 changed files with 424 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/rpc/src/system/helpers.rs
+1 -4
View File
@@ -54,8 +54,6 @@ pub struct Health {
#[derive(Debug, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct PeerInfo<Hash, Number> {
/// Peer Node Index
pub index: usize,
/// Peer ID
pub peer_id: String,
/// Roles
@@ -96,14 +94,13 @@ mod tests {
fn should_serialize_peer_info() {
assert_eq!(
::serde_json::to_string(&PeerInfo {
index: 1,
peer_id: "2".into(),
roles: "a".into(),
protocol_version: 2,
best_hash: 5u32,
best_number: 6u32,
}).unwrap(),
r#"{"index":1,"peerId":"2","roles":"a","protocolVersion":2,"bestHash":5,"bestNumber":6}"#,
r#"{"peerId":"2","roles":"a","protocolVersion":2,"bestHash":5,"bestNumber":6}"#,
);
}
}
substrate/core/rpc/src/system/mod.rs
+2 -3
View File
@@ -117,9 +117,8 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
}
fn system_peers(&self) -> Result<Vec<PeerInfo<B::Hash, <B::Header as HeaderT>::Number>>> {
Ok(self.sync.peers().into_iter().map(|(index, p)| PeerInfo {
index,
peer_id: p.peer_id.to_base58(),
Ok(self.sync.peers().into_iter().map(|(peer_id, p)| PeerInfo {
peer_id: peer_id.to_base58(),
roles: format!("{:?}", p.roles),
protocol_version: p.protocol_version,
best_hash: p.best_hash,
substrate/core/rpc/src/system/tests.rs
+3 -5
View File
@@ -16,7 +16,7 @@
use super::*;
use network::{self, ProtocolStatus, NodeIndex, PeerId, PeerInfo as NetworkPeerInfo};
use network::{self, ProtocolStatus, PeerId, PeerInfo as NetworkPeerInfo};
use network::config::Roles;
use test_client::runtime::Block;
use assert_matches::assert_matches;
@@ -57,12 +57,11 @@ impl network::SyncProvider<Block> for Status {
}
}
fn peers(&self) -> Vec<(NodeIndex, NetworkPeerInfo<Block>)> {
fn peers(&self) -> Vec<(PeerId, NetworkPeerInfo<Block>)> {
let mut peers = vec![];
for _peer in 0..self.peers {
peers.push(
(1, NetworkPeerInfo {
peer_id: self.peer_id.clone(),
(self.peer_id.clone(), NetworkPeerInfo {
roles: Roles::FULL,
protocol_version: 1,
best_hash: Default::default(),
@@ -187,7 +186,6 @@ fn system_peers() {
is_dev: true,
}).system_peers().unwrap(),
vec![PeerInfo {
index: 1,
peer_id: peer_id.to_base58(),
roles: "FULL".into(),
protocol_version: 1,