Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

net_version caches network_id to avoid redundant aquire of sync read lock #9544

Merged
merged 2 commits into from
Sep 13, 2018
Merged

net_version caches network_id to avoid redundant aquire of sync read lock #9544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
261b8c7
net_version caches network_id to avoid redundant aquire of sync read …
debris Sep 12, 2018
cf96a03
use lower_hex display formatting for net_peerCount rpc method
debris Sep 13, 2018
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
12 changes: 9 additions & 3 deletions rpc/src/v1/impls/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,31 @@ use v1::traits::Net;

/// Net rpc implementation.
pub struct NetClient<S: ?Sized> {
sync: Arc<S>
sync: Arc<S>,
/// Cached `network_id`.
///
/// We cache it to avoid redundant aquire of sync read lock.
/// https://github.com/paritytech/parity-ethereum/issues/8746
network_id: u64,
}

impl<S: ?Sized> NetClient<S> where S: SyncProvider {
/// Creates new NetClient.
pub fn new(sync: &Arc<S>) -> Self {
NetClient {
sync: sync.clone(),
network_id: sync.status().network_id,
}
}
}

impl<S: ?Sized> Net for NetClient<S> where S: SyncProvider + 'static {
fn version(&self) -> Result<String> {
Ok(format!("{}", self.sync.status().network_id).to_owned())
Ok(format!("{}", self.network_id))
}

fn peer_count(&self) -> Result<String> {
Ok(format!("0x{:x}", self.sync.status().num_peers as u64).to_owned())
Ok(format!("{:#x}", self.sync.status().num_peers as u64))
}

fn is_listening(&self) -> Result<bool> {
Expand Down