Chore: adjust code format

examples/raft-kv-memstore-singlethreaded/src/store.rs

@@ -6,6 +6,7 @@ use std::marker::PhantomData;
 use std::ops::RangeBounds;
 use std::rc::Rc;
 
+use openraft::entry::RaftEntry;
 use openraft::storage::RaftLogStorage;
 use openraft::storage::RaftStateMachine;
 use openraft::RaftLogReader;
@@ -307,7 +308,7 @@ impl RaftLogStorage<TypeConfig> for Rc<LogStore> {
         // Simple implementation that calls the flush-before-return `append_to_log`.
         let mut log = self.log.borrow_mut();
         for entry in entries {
-            log.insert(entry.log_id.index(), entry);
+            log.insert(entry.index(), entry);
         }
         callback.io_completed(Ok(()));
 

openraft/src/raft_state/tests/log_state_reader_test.rs

@@ -1,12 +1,11 @@
 use crate::engine::testing::UTConfig;
 use crate::engine::LogIdList;
 use crate::raft_state::LogStateReader;
-use crate::testing;
 use crate::type_config::alias::LogIdOf;
 use crate::RaftState;
 
 fn log_id(term: u64, index: u64) -> LogIdOf<UTConfig> {
-    testing::log_id(term, 0, index)
+    crate::engine::testing::log_id(term, 0, index)
 }
 
 #[test]

openraft/src/replication/mod.rs

@@ -398,8 +398,8 @@ where
                 // limited_get_log_entries will return logs smaller than the range [start, end).
                 let logs = self.log_reader.limited_get_log_entries(start, end).await?;
 
-                let first = logs.first().map(|x| x.get_log_id()).unwrap();
-                let last = logs.last().map(|x| x.log_id()).unwrap();
+                let first = logs.first().map(|ent| ent.get_log_id()).unwrap();
+                let last = logs.last().map(|ent| ent.log_id()).unwrap();
 
                 debug_assert!(
                     !logs.is_empty() && logs.len() <= (end - start) as usize,

openraft/src/testing/common.rs

@@ -5,7 +5,6 @@ use std::collections::BTreeSet;
 use crate::entry::RaftEntry;
 use crate::type_config::alias::LogIdOf;
 use crate::vote::RaftLeaderIdExt;
-use crate::LogId;
 use crate::RaftTypeConfig;
 
 /// Builds a log id, for testing purposes.
@@ -14,7 +13,7 @@ where
     C: RaftTypeConfig,
     C::Term: From<u64>,
 {
-    LogId::<C>::new(C::LeaderId::new_committed(term.into(), node_id), index)
+    LogIdOf::<C>::new(C::LeaderId::new_committed(term.into(), node_id), index)
 }
 
 /// Create a blank log entry for test.
@@ -23,7 +22,7 @@ where
     C: RaftTypeConfig,
     C::Term: From<u64>,
 {
-    crate::Entry::<C>::new_blank(log_id(term, node_id, index))
+    crate::Entry::<C>::new_blank(log_id::<C>(term, node_id, index))
 }
 
 /// Create a membership log entry without learner config for test.
@@ -34,7 +33,7 @@ where
     C::Node: Default,
 {
     crate::Entry::new_membership(
-        log_id(term, node_id, index),
+        log_id::<C>(term, node_id, index),
         crate::Membership::new_with_defaults(config, []),
     )
 }

openraft/src/testing/log/suite.rs

@@ -1379,10 +1379,7 @@ where
     C: RaftTypeConfig,
     C::NodeId: From<u64>,
 {
-    LogId {
-        leader_id: C::LeaderId::new_committed(term.into(), NODE_ID.into()),
-        index,
-    }
+    LogId::new(C::LeaderId::new_committed(term.into(), NODE_ID.into()), index)
 }
 
 /// Create a blank log entry with node_id 0 for test.
@@ -1463,8 +1460,5 @@ where
     C::Term: From<u64>,
     C::NodeId: From<u64>,
 {
-    LogId {
-        leader_id: C::LeaderId::new_committed(term.into(), node_id.into()),
-        index,
-    }
+    LogIdOf::<C>::new(C::LeaderId::new_committed(term.into(), node_id.into()), index)
 }

stores/memstore/src/lib.rs

@@ -393,7 +393,7 @@ impl RaftLogStorage<TypeConfig> for Arc<MemLogStore> {
         let mut log = self.log.write().await;
         for entry in entries {
             let s = serde_json::to_string(&entry).map_err(|e| StorageError::write_log_entry(entry.log_id(), &e))?;
-            log.insert(entry.log_id.index(), s);
+            log.insert(entry.index(), s);
         }
 
         callback.io_completed(Ok(()));

tests/tests/snapshot_streaming/t30_purge_in_snapshot_logs.rs

@@ -3,6 +3,7 @@ use std::time::Duration;
 
 use anyhow::Result;
 use maplit::btreeset;
+use openraft::entry::RaftEntry;
 use openraft::Config;
 use openraft::RaftLogReader;
 use tokio::time::sleep;
@@ -86,7 +87,7 @@ async fn purge_in_snapshot_logs() -> Result<()> {
     let logs = sto0.try_get_log_entries(..).await?;
     assert_eq!(
         log_index + 1 - max_keep,
-        logs[0].log_id.index(),
+        logs[0].index(),
         "leader's local logs are purged"
     );