squash commits

Signed-off-by: Fullstop000 <[email protected]>
tikv · Feb 25, 2020 · 1da637c · 1da637c
1 parent afabefa
commit 1da637c
Show file tree

Hide file tree

Showing 14 changed files with 1,219 additions and 100 deletions.
diff --git a/harness/src/network.rs b/harness/src/network.rs
@@ -150,13 +150,21 @@ impl Network {
     /// Read out all messages generated by peers in the `Network`.
     ///
     /// Note: messages are not filtered by any configured filters.
+    #[inline]
     pub fn read_messages(&mut self) -> Vec<Message> {
         self.peers
             .iter_mut()
             .flat_map(|(_peer, progress)| progress.read_messages())
             .collect()
     }
 
+    #[inline]
+    pub fn read_peer_messages(&mut self, id: u64) -> Vec<Message> {
+        self.peers
+            .get_mut(&id)
+            .map_or(vec![], |node| node.read_messages())
+    }
+
     /// Instruct the cluster to `step` through the given messages.
     ///
     /// NOTE: the given `msgs` won't be filtered by its filters.

diff --git a/harness/tests/integration_cases/mod.rs b/harness/tests/integration_cases/mod.rs
@@ -2,6 +2,7 @@
 
 mod test_raft;
 mod test_raft_flow_control;
+mod test_raft_follower_replication;
 mod test_raft_paper;
 mod test_raft_snap;
 mod test_raw_node;
diff --git a/harness/tests/integration_cases/test_raft.rs b/harness/tests/integration_cases/test_raft.rs
@@ -1196,7 +1196,7 @@ fn test_handle_msg_append() {
         );
 
         sm.become_follower(2, INVALID_ID);
-        sm.handle_append_entries(&m);
+        sm.handle_append_message(m);
         if sm.raft_log.last_index() != w_index {
             panic!(
                 "#{}: last_index = {}, want {}",