squash commits

Signed-off-by: Fullstop000 <[email protected]>

harness/src/interface.rs

@@ -48,11 +48,7 @@ impl Interface {
     /// Read messages out of the raft.
     pub fn read_messages(&mut self) -> Vec<Message> {
         match self.raft {
-            Some(_) => {
-                let mut msgs = self.msgs.drain(..).collect::<Vec<_>>();
-                msgs.extend(self.groups.take_messages());
-                msgs
-            }
+            Some(_) => self.msgs.drain(..).collect(),
             None => vec![],
         }
     }

harness/tests/integration_cases/test_raft.rs

@@ -127,7 +127,10 @@ fn next_ents(r: &mut Raft<MemStorage>, s: &MemStorage) -> Vec<Entry> {
 
 fn do_send_append(raft: &mut Raft<MemStorage>, to: u64) {
     let mut prs = raft.take_prs();
-    raft.send_append(to, &mut prs);
+    {
+        let pr = prs.get_mut(to).unwrap();
+        raft.send_append(to, pr);
+    }
     raft.set_prs(prs);
 }
 
@@ -1193,7 +1196,7 @@ fn test_handle_msg_append() {
         );
 
         sm.become_follower(2, INVALID_ID);
-        sm.handle_replication(m);
+        sm.handle_append_message(m);
         if sm.raft_log.last_index() != w_index {
             panic!(
                 "#{}: last_index = {}, want {}",
@@ -1360,7 +1363,7 @@ fn test_msg_append_response_wait_reset() {
 
     // The new leader has just emitted a new Term 4 entry; consume those messages
     // from the outgoing queue.
-    sm.bcast_append(None);
+    sm.bcast_append();
     sm.read_messages();
 
     // Node 2 acks the first entry, making it committed.