Skip to content

Commit

Permalink
Run rustfmt on refactor affected files
Browse files Browse the repository at this point in the history
  • Loading branch information
pool2win committed Oct 13, 2024
1 parent 754befb commit 896f06a
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 39 deletions.
33 changes: 15 additions & 18 deletions src/node/protocol/heartbeat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,17 @@ impl Service<Message> for Heartbeat {
let self_sender_id = self.sender_id.clone();
async move {
match msg {
Message::Unicast(Unicast::Heartbeat(HeartbeatMessage {
sender_id,
time,
})) => match sender_id.as_str() {
"" => Ok(Some(Message::Unicast(Unicast::Heartbeat(
HeartbeatMessage {
time: SystemTime::now(),
sender_id: self_sender_id,
},
)))),
_ => Ok(None),
},
Message::Unicast(Unicast::Heartbeat(HeartbeatMessage { sender_id, time })) => {
match sender_id.as_str() {
"" => Ok(Some(Message::Unicast(Unicast::Heartbeat(
HeartbeatMessage {
time: SystemTime::now(),
sender_id: self_sender_id,
},
)))),
_ => Ok(None),
}
}
_ => Ok(None),
}
}
Expand Down Expand Up @@ -141,12 +140,10 @@ mod heartbeat_tests {
.ready()
.await
.unwrap()
.call(Message::Unicast(Unicast::Heartbeat(
HeartbeatMessage {
sender_id: "local".to_string(),
time: SystemTime::now(),
},
)))
.call(Message::Unicast(Unicast::Heartbeat(HeartbeatMessage {
sender_id: "local".to_string(),
time: SystemTime::now(),
})))
.await
.unwrap();
assert!(res.is_none());
Expand Down
41 changes: 20 additions & 21 deletions src/node/protocol/membership.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,27 @@ impl Service<Message> for Membership {
let state = self.state.clone();
async move {
match msg {
Message::Unicast(Unicast::Membership(MembershipMessage {
message,
sender_id,
})) => match message {
None => {
let members = state
.membership_handle
.get_members()
.await
.unwrap()
.into_keys()
.collect();
Ok(Some(
MembershipMessage {
sender_id,
message: Some(members),
}
.into(),
))
Message::Unicast(Unicast::Membership(MembershipMessage { message, sender_id })) => {
match message {
None => {
let members = state
.membership_handle
.get_members()
.await
.unwrap()
.into_keys()
.collect();
Ok(Some(
MembershipMessage {
sender_id,
message: Some(members),
}
.into(),
))
}
_ => Ok(None),
}
_ => Ok(None),
},
}
_ => Ok(None),
}
}
Expand Down

0 comments on commit 896f06a

Please sign in to comment.