Fix clippy errors.

src/rpcs.rs

@@ -186,7 +186,7 @@ mod tests {
         };
         let response =
             futures::executor::block_on(rpc_client.call_request_vote(request))?;
-        assert_eq!(true, response.vote_granted);
+        assert!(response.vote_granted);
 
         let request = AppendEntriesArgs::<i32> {
             term: Term(2021),
@@ -200,7 +200,7 @@ mod tests {
             rpc_client.call_append_entries(request),
         )?;
         assert_eq!(2021, response.term.0);
-        assert_eq!(true, response.success);
+        assert!(response.success);
 
         Ok(())
     }

tests/agreement_tests.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::identity_op)]
 #[macro_use]
 extern crate anyhow;
 extern crate bytes;
@@ -244,7 +245,7 @@ fn count() -> config::Result<()> {
     cfg.check_one_leader()?;
     let total = cfg.total_rpcs();
     assert!(
-        total >= 1 && total <= 30,
+        (1..=30).contains(&total),
         "too many or few RPCs ({}) to elect initial leader",
         total
     );

tests/config/mod.rs

@@ -9,7 +9,7 @@ use rand::{thread_rng, Rng};
 use tokio::time::Duration;
 
 use ruaft::rpcs::register_server;
-use ruaft::{ApplyCommandMessage, Persister, Raft, RpcClient};
+use ruaft::{ApplyCommandMessage, Persister, Raft, RpcClient, Term};
 
 pub mod persister;
 
@@ -57,7 +57,10 @@ impl Config {
                     if let Some(raft) = &state.rafts[i] {
                         let (term, is_leader) = raft.get_state();
                         if is_leader {
-                            leaders.entry(term.0).or_insert(vec![]).push(i)
+                            leaders
+                                .entry(term.0)
+                                .or_insert_with(Vec::new)
+                                .push(i)
                         }
                     }
                 }
@@ -166,12 +169,10 @@ impl Config {
 
             if let Some(at_term) = at_term {
                 let state = self.state.lock();
-                for raft in &state.rafts {
-                    if let Some(raft) = raft {
-                        let (term, _) = raft.get_state();
-                        if term.0 > at_term {
-                            return Ok(None);
-                        }
+                for raft in state.rafts.iter().flatten() {
+                    let (Term(term), _) = raft.get_state();
+                    if term > at_term {
+                        return Ok(None);
                     }
                 }
             }

tests/config/persister/mod.rs

@@ -20,6 +20,12 @@ impl Persister {
     }
 }
 
+impl Default for Persister {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ruaft::Persister for Persister {
     fn read_state(&self) -> bytes::Bytes {
         self.state.lock().bytes.clone()

tests/persist_tests.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::identity_op)]
 #[macro_use]
 extern crate anyhow;
 extern crate bytes;
@@ -162,10 +163,10 @@ fn figure8() -> config::Result<()> {
     for _ in 0..1000 {
         let mut leader = None;
         for i in 0..SERVERS {
-            if cfg.is_server_alive(i) {
-                if let Some(_) = cfg.leader_start(i, thread_rng().gen()) {
-                    leader = Some(i);
-                }
+            if cfg.is_server_alive(i)
+                && cfg.leader_start(i, thread_rng().gen()).is_some()
+            {
+                leader = Some(i);
             }
         }
 
@@ -256,12 +257,11 @@ fn figure8_unreliable() -> config::Result<()> {
 
         let mut leader = None;
         for i in 0..SERVERS {
-            if cfg.is_server_alive(i) {
-                if let Some(_) = cfg.leader_start(i, thread_rng().gen()) {
-                    if cfg.is_connected(i) {
-                        leader = Some(i);
-                    }
-                }
+            if cfg.is_server_alive(i)
+                && cfg.leader_start(i, thread_rng().gen()).is_some()
+                && cfg.is_connected(i)
+            {
+                leader = Some(i);
             }
         }
 
@@ -340,6 +340,7 @@ fn internal_churn(unreliable: bool) -> config::Result<()> {
                                 Ok(t) => t,
                                 Err(e) => return Err(e),
                             };
+                        #[allow(clippy::collapsible_if)]
                         if cmd_index > 0 {
                             if cmd_committed == cmd {
                                 cmds.push(cmd);