fixing some example tests

cluster_benchmark/tests/benchmark/store.rs

@@ -16,6 +16,7 @@ use openraft::storage::RaftLogStorage;
 use openraft::storage::RaftSnapshotBuilder;
 use openraft::storage::RaftStateMachine;
 use openraft::storage::Snapshot;
+use openraft::raft::ExampleSnapshot;
 use openraft::Entry;
 use openraft::EntryPayload;
 use openraft::LogId;
@@ -41,7 +42,7 @@ pub type NodeId = u64;
 
 openraft::declare_raft_types!(
     pub TypeConfig: D = ClientRequest, R = ClientResponse, NodeId = NodeId, Node = (),
-    Entry = Entry<TypeConfig>, SnapshotData = Cursor<Vec<u8>>, AsyncRuntime = TokioRuntime
+    Entry = Entry<TypeConfig>, SnapshotData = ExampleSnapshot, AsyncRuntime = TokioRuntime
 );
 
 #[derive(Debug)]
@@ -165,7 +166,7 @@ impl RaftSnapshotBuilder<TypeConfig> for Arc<StateMachineStore> {
 
         Ok(Snapshot {
             meta,
-            snapshot: Box::new(Cursor::new(data)),
+            snapshot: Box::new(Cursor::new(data).into()),
         })
     }
 }
@@ -279,7 +280,7 @@ impl RaftStateMachine<TypeConfig> for Arc<StateMachineStore> {
     async fn begin_receiving_snapshot(
         &mut self,
     ) -> Result<Box<<TypeConfig as RaftTypeConfig>::SnapshotData>, StorageError<NodeId>> {
-        Ok(Box::new(Cursor::new(Vec::new())))
+        Ok(Box::new(Cursor::new(Vec::new()).into()))
     }
 
     #[tracing::instrument(level = "trace", skip(self, snapshot))]
@@ -314,7 +315,7 @@ impl RaftStateMachine<TypeConfig> for Arc<StateMachineStore> {
                 let data = snapshot.data.clone();
                 Ok(Some(Snapshot {
                     meta: snapshot.meta.clone(),
-                    snapshot: Box::new(Cursor::new(data)),
+                    snapshot: Box::new(Cursor::new(data).into()),
                 }))
             }
             None => Ok(None),

examples/raft-kv-memstore/src/lib.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::uninlined_format_args)]
 #![deny(unused_qualifications)]
 
-use std::io::Cursor;
+
 use std::sync::Arc;
 
 use actix_web::middleware;
@@ -12,6 +12,7 @@ use openraft::storage::Adaptor;
 use openraft::BasicNode;
 use openraft::Config;
 use openraft::TokioRuntime;
+use openraft::raft::ExampleSnapshot;
 
 use crate::app::App;
 use crate::network::api;
@@ -32,7 +33,7 @@ pub type NodeId = u64;
 openraft::declare_raft_types!(
     /// Declare the type configuration for example K/V store.
     pub TypeConfig: D = Request, R = Response, NodeId = NodeId, Node = BasicNode,
-    Entry = openraft::Entry<TypeConfig>, SnapshotData = Cursor<Vec<u8>>, AsyncRuntime = TokioRuntime
+    Entry = openraft::Entry<TypeConfig>, SnapshotData = ExampleSnapshot, AsyncRuntime = TokioRuntime
 );
 
 pub type LogStore = Adaptor<TypeConfig, Arc<Store>>;

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

@@ -153,7 +153,7 @@ impl RaftSnapshotBuilder<TypeConfig> for Arc<Store> {
 
         Ok(Snapshot {
             meta,
-            snapshot: Box::new(Cursor::new(data)),
+            snapshot: Box::new(Cursor::new(data).into()),
         })
     }
 }
@@ -280,7 +280,7 @@ impl RaftStorage<TypeConfig> for Arc<Store> {
     async fn begin_receiving_snapshot(
         &mut self,
     ) -> Result<Box<<TypeConfig as RaftTypeConfig>::SnapshotData>, StorageError<NodeId>> {
-        Ok(Box::new(Cursor::new(Vec::new())))
+        Ok(Box::new(Cursor::new(Vec::new()).into()))
     }
 
     #[tracing::instrument(level = "trace", skip(self, snapshot))]
@@ -320,7 +320,7 @@ impl RaftStorage<TypeConfig> for Arc<Store> {
                 let data = snapshot.data.clone();
                 Ok(Some(Snapshot {
                     meta: snapshot.meta.clone(),
-                    snapshot: Box::new(Cursor::new(data)),
+                    snapshot: Box::new(Cursor::new(data).into()),
                 }))
             }
             None => Ok(None),

examples/raft-kv-rocksdb/src/lib.rs

@@ -11,6 +11,7 @@ use async_std::task;
 use openraft::storage::Adaptor;
 use openraft::Config;
 use openraft::TokioRuntime;
+use openraft::raft::ExampleSnapshot;
 
 use crate::app::App;
 use crate::network::api;
@@ -42,7 +43,7 @@ impl Display for Node {
 openraft::declare_raft_types!(
     /// Declare the type configuration for example K/V store.
     pub TypeConfig: D = Request, R = Response, NodeId = NodeId, Node = Node,
-    Entry = openraft::Entry<TypeConfig>, SnapshotData = Cursor<Vec<u8>>, AsyncRuntime = TokioRuntime
+    Entry = openraft::Entry<TypeConfig>, SnapshotData = ExampleSnapshot, AsyncRuntime = TokioRuntime
 );
 
 pub type LogStore = Adaptor<TypeConfig, Arc<Store>>;

examples/raft-kv-rocksdb/src/store.rs

@@ -387,7 +387,7 @@ impl RaftSnapshotBuilder<TypeConfig> for Arc<Store> {
 
         Ok(Snapshot {
             meta,
-            snapshot: Box::new(Cursor::new(data)),
+            snapshot: Box::new(Cursor::new(data).into()),
         })
     }
 }
@@ -511,7 +511,7 @@ impl RaftStorage<TypeConfig> for Arc<Store> {
     async fn begin_receiving_snapshot(
         &mut self,
     ) -> Result<Box<<TypeConfig as RaftTypeConfig>::SnapshotData>, StorageError<NodeId>> {
-        Ok(Box::new(Cursor::new(Vec::new())))
+        Ok(Box::new(Cursor::new(Vec::new()).into()))
     }
 
     #[tracing::instrument(level = "trace", skip(self, snapshot))]
@@ -549,7 +549,7 @@ impl RaftStorage<TypeConfig> for Arc<Store> {
                 let data = snapshot.data.clone();
                 Ok(Some(Snapshot {
                     meta: snapshot.meta,
-                    snapshot: Box::new(Cursor::new(data)),
+                    snapshot: Box::new(Cursor::new(data).into()),
                 }))
             }
             None => Ok(None),

openraft/src/raft/mod.rs

@@ -88,7 +88,7 @@ use crate::StorageHelper;
 ///        NodeId       = u64,
 ///        Node         = openraft::BasicNode,
 ///        Entry        = openraft::Entry<TypeConfig>,
-///        SnapshotData = Cursor<Vec<u8>>,
+///        SnapshotData = openraft::ExampleSnapshot,
 ///        AsyncRuntime = openraft::TokioRuntime,
 /// );
 /// ```

openraft/src/type_config.rs

@@ -30,7 +30,7 @@ use crate::NodeId;
 ///        NodeId       = u64,
 ///        Node         = openraft::BasicNode,
 ///        Entry        = openraft::Entry<TypeConfig>,
-///        SnapshotData = Cursor<Vec<u8>>,
+///        SnapshotData = ExampleSnapshot,
 ///        AsyncRuntime = openraft::TokioRuntime,
 /// );
 /// ```

stores/rocksstore-v2/src/lib.rs

@@ -39,6 +39,7 @@ use openraft::StorageError;
 use openraft::StorageIOError;
 use openraft::StoredMembership;
 use openraft::TokioRuntime;
+use openraft::raft::ExampleSnapshot;
 use openraft::Vote;
 use rand::Rng;
 use rocksdb::ColumnFamily;
@@ -54,7 +55,7 @@ pub type RocksNodeId = u64;
 openraft::declare_raft_types!(
     /// Declare the type configuration.
     pub TypeConfig: D = RocksRequest, R = RocksResponse, NodeId = RocksNodeId, Node = BasicNode,
-    Entry = Entry<TypeConfig>, SnapshotData = Cursor<Vec<u8>>, AsyncRuntime = TokioRuntime
+    Entry = Entry<TypeConfig>, SnapshotData = ExampleSnapshot, AsyncRuntime = TokioRuntime
 );
 
 /**
@@ -305,7 +306,7 @@ impl RaftSnapshotBuilder<TypeConfig> for RocksStateMachine {
 
         Ok(Snapshot {
             meta,
-            snapshot: Box::new(Cursor::new(data)),
+            snapshot: Box::new(Cursor::new(data).into()),
         })
     }
 }
@@ -455,7 +456,7 @@ impl RaftStateMachine<TypeConfig> for RocksStateMachine {
     async fn begin_receiving_snapshot(
         &mut self,
     ) -> Result<Box<<TypeConfig as RaftTypeConfig>::SnapshotData>, StorageError<RocksNodeId>> {
-        Ok(Box::new(Cursor::new(Vec::new())))
+        Ok(Box::new(Cursor::new(Vec::new()).into()))
     }
 
     async fn install_snapshot(
@@ -510,7 +511,7 @@ impl RaftStateMachine<TypeConfig> for RocksStateMachine {
 
         Ok(Some(Snapshot {
             meta: snapshot.meta,
-            snapshot: Box::new(Cursor::new(data)),
+            snapshot: Box::new(Cursor::new(data).into()),
         }))
     }
 }