WIP

Cargo.toml

@@ -36,3 +36,4 @@ memstore-example-harness = { path = "examples/memstore" }
 
 [patch.crates-io]
 jopemachine-raft = { path = "./raft-rs" }
+raftify = { path = "./raftify" }

examples/memstore/Cargo.toml

@@ -17,8 +17,6 @@ name = "raftify-client-example"
 path = "src/client/main.rs"
 
 [dependencies]
-raftify.workspace = true
-
 actix-rt = "2.10"
 actix-web = "4.9.0"
 async-trait = "0.1.82"
@@ -28,6 +26,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1.40", features = ["full"] }
 color-backtrace = "0.6.1"
+raftify = { version = "0.1.78" }
+raftify_cli = { version = "0.1.1" }
 
 [features]
 default = ["heed_storage"]

examples/memstore/src/cli/main.rs

@@ -1,11 +1,10 @@
-// use raftify::{cli::cli_handler, Result};
 use raftify::Result;
+use raftify_cli::cli_handler;
 
 use memstore_example_harness::state_machine::{HashStore, LogEntry, StorageType};
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    // cli_handler::<LogEntry, StorageType, HashStore>(None).await?;
-
+    cli_handler::<LogEntry, StorageType, HashStore>(None).await?;
     Ok(())
 }

examples/memstore/src/state_machine.rs

@@ -7,9 +7,6 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-#[cfg(feature = "inmemory_storage")]
-pub use raftify::MemStorage as StorageType;
-
 #[cfg(feature = "heed_storage")]
 pub use raftify::HeedStorage as StorageType;
 

raftify-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raftify_cli"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 description = "Raftify CLI tool"
 license = "MIT/Apache-2.0"

raftify-cli/src/commands/debug.rs

@@ -11,10 +11,9 @@ use raftify::{
     },
     raft_node::utils::format_debugging_info,
     raft_service, Config, Result, StableStorage,
+    HeedStorage, StorageType,
 };
 
-use raftify::{HeedStorage, StorageType};
-
 pub fn debug_persisted<LogStorage: StableStorage>(path: &str, logger: slog::Logger) -> Result<()> {
     let config = Config {
         log_dir: path.to_string(),
@@ -80,6 +79,7 @@ pub fn debug_persisted_all<LogStorage: StableStorage>(
         dir_entries.sort();
 
         for name in dir_entries {
+            println!("*----- {name} -----*");
             debug_persisted::<LogStorage>(&format!("{}/{}", path_str, name), logger.clone())?;
             println!();
         }