upd

Signed-off-by: Akira Hayakawa <[email protected]>

Author: akiradeveloper

sorock/src/backend/redb/ballot.rs

@@ -5,7 +5,7 @@ use redb::ReadableDatabase;
 mod value {
     use super::*;
 
-    #[derive(serde::Deserialize, serde::Serialize)]
+    #[derive(Deserialize, Serialize)]
     struct OnDiskStruct {
         term: u64,
         voted_for: Option<sorock::NodeAddress>,

sorock/src/backend/redb/log.rs

@@ -6,7 +6,7 @@ use std::time::Duration;
 mod value {
     use super::*;
 
-    #[derive(serde::Deserialize, serde::Serialize)]
+    #[derive(Deserialize, Serialize)]
     struct OnDiskStruct {
         prev_term: u64,
         cur_index: u64,

sorock/src/backend/redb/mod.rs

@@ -4,6 +4,7 @@ use anyhow::Result;
 use async_trait::async_trait;
 use crossbeam::channel::TryRecvError;
 use redb::{Database, ReadableTable, ReadableTableMetadata, TableDefinition};
+use serde::{Deserialize, Serialize};
 use sorock::process::*;
 use std::sync::Arc;
 

sorock/src/lib.rs

@@ -13,24 +13,17 @@ pub mod service;
 
 use anyhow::{bail, ensure, Context, Result};
 use bytes::Bytes;
-use derive_more::Deref;
+use derive_more::{Deref, Display, FromStr};
 use futures::Stream;
 use futures::StreamExt;
+use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use std::time::Duration;
 use tonic::transport::Uri;
 
 /// Identifier of `RaftNode`.
 #[derive(
-    serde::Serialize,
-    serde::Deserialize,
-    Clone,
-    PartialEq,
-    Eq,
-    Hash,
-    Debug,
-    derive_more::Display,
-    derive_more::FromStr,
+    serde::Serialize, serde::Deserialize, Clone, PartialEq, Eq, Hash, Debug, Display, FromStr,
 )]
 pub struct NodeAddress(#[serde(with = "http_serde::uri")] Uri);
 

sorock/src/process/app/state_machine/command.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(serde::Serialize, serde::Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub enum Command<'a> {
     /// Any append entry from a client shouldn't be processed unless consensus is reached
     /// up to the barrier entry which is queued by the current leader.

sorock/src/process/kernel_message.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(serde::Serialize, serde::Deserialize, std::fmt::Debug)]
+#[derive(Serialize, Deserialize, std::fmt::Debug)]
 pub enum KernelMessage {
     AddServer(NodeAddress),
     RemoveServer(NodeAddress),

testing/example/src/lib.rs

@@ -1,13 +1,14 @@
 use anyhow::Result;
 use bytes::Bytes;
+use serde::{Deserialize, Serialize};
 use sorock::service::raft::client::*;
 use tonic::codegen::CompressionEncoding;
 use tonic::transport::Channel;
 
 pub mod ping_app;
 pub mod raft_process;
 
-#[derive(serde::Serialize, serde::Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub enum AppWriteRequest {
     FetchAdd { bytes: Vec<u8> },
 }
@@ -21,7 +22,7 @@ impl AppWriteRequest {
     }
 }
 
-#[derive(serde::Serialize, serde::Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub enum AppReadRequest {
     Read,
     MakeSnapshot,
@@ -36,7 +37,7 @@ impl AppReadRequest {
     }
 }
 
-#[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug)]
 pub struct AppState(pub u64);
 impl AppState {
     pub fn serialize(&self) -> Bytes {

testing/example/src/raft_process/mod.rs

@@ -41,7 +41,7 @@ impl AppSnapshot {
     }
 }
 
-#[derive(serde::Serialize, serde::Deserialize)]
+#[derive(Serialize, Deserialize)]
 struct SnapshotTable {
     inner: BTreeMap<u64, AppState>,
 }