Move RaftState to a separate file.

src/lib.rs

@@ -18,21 +18,16 @@ use rand::{thread_rng, Rng};
 
 use crate::persister::PersistedRaftState;
 pub use crate::persister::Persister;
+pub(crate) use crate::raft_state::RaftState;
+pub(crate) use crate::raft_state::State;
 pub use crate::rpcs::RpcClient;
 use crate::utils::retry_rpc;
 
 mod persister;
+mod raft_state;
 pub mod rpcs;
 pub mod utils;
 
-#[derive(Debug, Eq, PartialEq)]
-enum State {
-    Follower,
-    Candidate,
-    // TODO: add PreVote
-    Leader,
-}
-
 #[derive(
     Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize,
 )]
@@ -53,23 +48,6 @@ struct LogEntry {
     command: Command,
 }
 
-struct RaftState {
-    current_term: Term,
-    voted_for: Option<Peer>,
-    log: Vec<LogEntry>,
-
-    commit_index: Index,
-    last_applied: Index,
-
-    next_index: Vec<Index>,
-    match_index: Vec<Index>,
-    current_step: Vec<i64>,
-
-    state: State,
-
-    leader_id: Peer,
-}
-
 struct ElectionState {
     // Timer will be removed upon shutdown or elected.
     timer: Mutex<(usize, Option<Instant>)>,
@@ -847,22 +825,6 @@ impl Raft {
     }
 }
 
-impl RaftState {
-    fn persisted_state(&self) -> PersistedRaftState {
-        self.into()
-    }
-
-    fn last_log_index_and_term(&self) -> (Index, Term) {
-        let len = self.log.len();
-        assert!(len > 0, "There should always be at least one entry in log");
-        (len - 1, self.log.last().unwrap().term)
-    }
-
-    fn is_leader(&self) -> bool {
-        self.state == State::Leader
-    }
-}
-
 const HEARTBEAT_INTERVAL_MILLIS: u64 = 150;
 const ELECTION_TIMEOUT_BASE_MILLIS: u64 = 150;
 const ELECTION_TIMEOUT_VAR_MILLIS: u64 = 250;

src/raft_state.rs

@@ -0,0 +1,42 @@
+use crate::{persister::PersistedRaftState, Index, LogEntry, Peer, Term};
+
+#[derive(Debug, Eq, PartialEq)]
+pub(crate) enum State {
+    Follower,
+    Candidate,
+    // TODO: add PreVote
+    Leader,
+}
+
+pub(crate) struct RaftState {
+    pub current_term: Term,
+    pub voted_for: Option<Peer>,
+    pub log: Vec<LogEntry>,
+
+    pub commit_index: Index,
+    pub last_applied: Index,
+
+    pub next_index: Vec<Index>,
+    pub match_index: Vec<Index>,
+    pub current_step: Vec<i64>,
+
+    pub state: State,
+
+    pub leader_id: Peer,
+}
+
+impl RaftState {
+    pub fn persisted_state(&self) -> PersistedRaftState {
+        self.into()
+    }
+
+    pub fn last_log_index_and_term(&self) -> (Index, Term) {
+        let len = self.log.len();
+        assert!(len > 0, "There should always be at least one entry in log");
+        (len - 1, self.log.last().unwrap().term)
+    }
+
+    pub fn is_leader(&self) -> bool {
+        self.state == State::Leader
+    }
+}