Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use "id" nomenclature more consistently

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-15 10:15:59 +01:00
parent af77f1188a
commit 688f179256
8 changed files with 127 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/rpc/src/peer.rs
View file

@ -25,14 +25,14 @@ use tracing::instrument;
#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
pub struct ConnectionId {
pub epoch: u32,
pub owner_id: u32,
pub id: u32,
}
impl Into<PeerId> for ConnectionId {
fn into(self) -> PeerId {
PeerId {
epoch: self.epoch,
owner_id: self.owner_id,
id: self.id,
}
}
@ -41,7 +41,7 @@ impl Into<PeerId> for ConnectionId {
impl From<PeerId> for ConnectionId {
fn from(peer_id: PeerId) -> Self {
Self {
epoch: peer_id.epoch,
owner_id: peer_id.owner_id,
id: peer_id.id,
}
}
@ -49,7 +49,7 @@ impl From<PeerId> for ConnectionId {
impl fmt::Display for ConnectionId {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}/{}", self.epoch, self.id)
write!(f, "{}/{}", self.owner_id, self.id)
}
}
@ -157,7 +157,7 @@ impl Peer {
let (outgoing_tx, mut outgoing_rx) = mpsc::unbounded();
let connection_id = ConnectionId {
epoch: self.epoch.load(SeqCst),
owner_id: self.epoch.load(SeqCst),
id: self.next_connection_id.fetch_add(1, SeqCst),
};
let connection_state = ConnectionState {