Parcourir la source

Remove labrpc as a dependency of the ruaft main crate.

The persister is moved to the crate level so that it can be shared.
Jing Yang il y a 4 ans
Parent
commit
21a5b8153f

+ 0 - 1
Cargo.toml

@@ -34,7 +34,6 @@ integration-test = ["test_utils"]
 [dev-dependencies]
 anyhow = "1.0"
 futures = { version = "0.3.15", features = ["thread-pool"] }
-labrpc = "0.1.12"
 ruaft = { path = ".", features = ["integration-test"] }
 scopeguard = "1.1.0"
 stdext = "0.3"

+ 2 - 0
test_configs/src/lib.rs

@@ -1,4 +1,6 @@
+mod persister;
 pub mod raft;
 mod rpcs;
 
+pub use persister::Persister;
 pub use rpcs::{make_rpc_handler, register_server, RpcClient};

+ 0 - 0
test_configs/src/raft/persister.rs → test_configs/src/persister.rs


+ 3 - 3
test_configs/src/raft/config.rs

@@ -21,7 +21,7 @@ struct LogState {
     committed_logs: Vec<Vec<i32>>,
     results: Vec<Result<()>>,
     max_index: usize,
-    saved: Vec<Arc<super::Persister>>,
+    saved: Vec<Arc<crate::Persister>>,
 }
 
 pub struct Config {
@@ -288,7 +288,7 @@ impl Config {
             raft.kill();
         }
         let mut log = self.log.lock();
-        log.saved[index] = Arc::new(super::Persister::new());
+        log.saved[index] = Arc::new(crate::Persister::new());
         log.saved[index].save_state(data);
     }
 
@@ -473,7 +473,7 @@ pub fn make_config(
     });
 
     let mut saved = vec![];
-    saved.resize_with(server_count, || Arc::new(super::Persister::new()));
+    saved.resize_with(server_count, || Arc::new(crate::Persister::new()));
     let log = Arc::new(Mutex::new(LogState {
         committed_logs: vec![vec![]; server_count],
         results: vec![],

+ 0 - 3
test_configs/src/raft/mod.rs

@@ -1,4 +1 @@
 pub mod config;
-mod persister;
-
-pub use persister::Persister;