Przeglądaj źródła

Remove some duplicate code.

Jing Yang 5 lat temu
rodzic
commit
21f3505844
1 zmienionych plików z 5 dodań i 11 usunięć
  1. 5 11
      src/lib.rs

+ 5 - 11
src/lib.rs

@@ -407,24 +407,18 @@ impl Raft {
     ) -> Option<AppendEntriesArgs> {
         let rf = rf.lock();
 
-        // copy states.
-        let term = rf.current_term;
-        let is_leader = rf.state == State::Leader;
-        let (last_log_index, last_log_term) = rf.last_log_index_and_term();
-        let commit_index = rf.commit_index;
-        let leader_id = rf.leader_id;
-
-        if !is_leader {
+        if rf.state == State::Leader {
             return None;
         }
 
+        let (last_log_index, last_log_term) = rf.last_log_index_and_term();
         let args = AppendEntriesArgs {
-            term,
-            leader_id,
+            term: rf.current_term,
+            leader_id: rf.leader_id,
             prev_log_index: last_log_index,
             prev_log_term: last_log_term,
             entries: vec![],
-            leader_commit: commit_index,
+            leader_commit: rf.commit_index,
         };
         Some(args)
     }