Skip to content

Commit

Permalink
Remove raft::Address::Local
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikgrinaker
erikgrinaker committed Nov 18, 2023
1 parent 0349bec commit d2b1a79
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 74 deletions.
2 changes: 0 additions & 2 deletions src/raft/message.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ pub enum Address {
/// A node with the specified node ID (local or remote). Valid both as
/// sender and recipient.
Node(NodeID),
/// The local node.
Local,
/// A local client.
Client,
}
Expand Down
14 changes: 7 additions & 7 deletions src/raft/node/candidate.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ConfirmLeader { commit_index: 2, has_committed: true },
Expand All @@ -197,7 +197,7 @@ mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 4,
event: Event::ConfirmLeader { commit_index: 2, has_committed: true },
Expand Down Expand Up @@ -252,7 +252,7 @@ mod tests {
assert_eq!(
node_rx.try_recv()?,
Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Broadcast,
term: 3,
event: Event::Heartbeat { commit_index: 2, commit_term: 1 },
Expand All @@ -263,7 +263,7 @@ mod tests {
assert_eq!(
node_rx.try_recv()?,
Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(to),
term: 3,
event: Event::ReplicateEntries {
Expand All @@ -288,15 +288,15 @@ mod tests {

node = node.step(Message {
from: Address::Client,
to: Address::Local,
to: Address::Node(1),
term: 0,
event: Event::ClientRequest { id: vec![0x01], request: Request::Mutate(vec![0xaf]) },
})?;
assert_node(&mut node).is_candidate().term(3);
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Client,
term: 3,
event: Event::ClientResponse { id: vec![0x01], response: Err(Error::Abort) },
Expand All @@ -322,7 +322,7 @@ mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Broadcast,
term: 4,
event: Event::SolicitVote { last_index: 3, last_term: 2 },
Expand Down
52 changes: 26 additions & 26 deletions src/raft/node/follower.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ConfirmLeader { commit_index: 3, has_committed: true },
Expand Down Expand Up @@ -257,7 +257,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ConfirmLeader { commit_index: 3, has_committed: false },
Expand All @@ -281,7 +281,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ConfirmLeader { commit_index: 5, has_committed: false },
Expand Down Expand Up @@ -322,7 +322,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(3),
term: 3,
event: Event::ConfirmLeader { commit_index: 3, has_committed: true },
Expand Down Expand Up @@ -351,7 +351,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ConfirmLeader { commit_index: 1, has_committed: true },
Expand All @@ -375,7 +375,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(3),
term: 4,
event: Event::ConfirmLeader { commit_index: 3, has_committed: true },
Expand Down Expand Up @@ -422,7 +422,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(3),
term: 3,
event: Event::GrantVote,
Expand All @@ -441,7 +441,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(3),
term: 3,
event: Event::GrantVote,
Expand Down Expand Up @@ -552,7 +552,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::AcceptEntries { last_index: 2 },
Expand Down Expand Up @@ -589,7 +589,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::AcceptEntries { last_index: 5 },
Expand Down Expand Up @@ -625,7 +625,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::AcceptEntries { last_index: 4 },
Expand Down Expand Up @@ -661,7 +661,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::AcceptEntries { last_index: 4 },
Expand Down Expand Up @@ -697,7 +697,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::AcceptEntries { last_index: 4 },
Expand Down Expand Up @@ -729,7 +729,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::RejectEntries,
Expand Down Expand Up @@ -761,7 +761,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::RejectEntries,
Expand All @@ -779,7 +779,7 @@ pub mod tests {

node = node.step(Message {
from: Address::Client,
to: Address::Local,
to: Address::Node(1),
term: 0,
event: Event::ClientRequest { id: vec![0x01], request: Request::Mutate(vec![0xaf]) },
})?;
Expand All @@ -791,7 +791,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ClientRequest {
Expand All @@ -815,7 +815,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Client,
term: 3,
event: Event::ClientResponse {
Expand All @@ -837,15 +837,15 @@ pub mod tests {

node = node.step(Message {
from: Address::Client,
to: Address::Local,
to: Address::Node(1),
term: 0,
event: Event::ClientRequest { id: vec![0x01], request: Request::Mutate(vec![0xaf]) },
})?;
assert_node(&mut node).is_follower().term(3).leader(None).proxied(vec![]);
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Client,
term: 3,
event: Event::ClientResponse { id: vec![0x01], response: Err(Error::Abort) },
Expand All @@ -863,7 +863,7 @@ pub mod tests {

node = node.step(Message {
from: Address::Client,
to: Address::Local,
to: Address::Node(1),
term: 0,
event: Event::ClientRequest { id: vec![0x01], request: Request::Mutate(vec![0xaf]) },
})?;
Expand All @@ -875,7 +875,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ClientRequest {
Expand All @@ -898,13 +898,13 @@ pub mod tests {
&mut node_rx,
vec![
Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Client,
term: 4,
event: Event::ClientResponse { id: vec![0x01], response: Err(Error::Abort) },
},
Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(3),
term: 4,
event: Event::ConfirmLeader { commit_index: 3, has_committed: true },
Expand Down Expand Up @@ -940,7 +940,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Node(2),
term: 3,
event: Event::ConfirmLeader { commit_index: 2, has_committed: true },
Expand All @@ -957,7 +957,7 @@ pub mod tests {
assert_messages(
&mut node_rx,
vec![Message {
from: Address::Local,
from: Address::Node(1),
to: Address::Broadcast,
term: 4,
event: Event::SolicitVote { last_index: 3, last_term: 2 },
Expand Down
Loading

0 comments on commit d2b1a79

Please sign in to comment.