Add CodecError, use from attribute in primary and replica errors

ivan770 · Jul 26, 2020 · 56ef71b · 56ef71b
1 parent cde1813
commit 56ef71b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/spartan/src/node/replication/primary/error.rs b/spartan/src/node/replication/primary/error.rs
@@ -4,10 +4,10 @@ use tokio::io::Error as IoError;
 
 #[derive(Error, Debug)]
 pub enum PrimaryError {
-    #[error("Unable to serialize stream message: {0}")]
-    SerializationError(Box<ErrorKind>),
-    #[error("TCP connection error: {0}")]
-    SocketError(IoError),
+    #[error("Socket codec error")]
+    CodecError(#[from] Box<ErrorKind>),
+    #[error("TCP connection error")]
+    SocketError(#[from] IoError),
     #[error("TCP socket is empty")]
     EmptySocket,
     #[error("Protocol mismatch")]

diff --git a/spartan/src/node/replication/primary/stream.rs b/spartan/src/node/replication/primary/stream.rs
@@ -28,14 +28,14 @@ impl<'a> Stream {
         self.0
             .send(Request::Primary(message))
             .await
-            .map_err(PrimaryError::SerializationError)?;
+            .map_err(PrimaryError::CodecError)?;
 
         SinkExt::<Request>::flush(&mut self.0)
             .await
-            .map_err(PrimaryError::SerializationError)?;
+            .map_err(PrimaryError::CodecError)?;
 
         let buf = match self.0.next().await {
-            Some(r) => r.map_err(PrimaryError::SerializationError)?,
+            Some(r) => r.map_err(PrimaryError::CodecError)?,
             None => return Err(PrimaryError::EmptySocket),
         };
 

diff --git a/spartan/src/node/replication/replica/error.rs b/spartan/src/node/replication/replica/error.rs
@@ -5,16 +5,16 @@ use tokio::io::Error as IoError;
 
 #[derive(Error, Debug)]
 pub enum ReplicaError {
-    #[error("Manager persistence error: {0}")]
-    PersistenceError(PersistenceError),
+    #[error("Manager persistence error")]
+    PersistenceError(#[from] PersistenceError),
     #[error("Unable to find replica node config")]
     ReplicaConfigNotFound,
-    #[error("TCP socket error: {0}")]
-    SocketError(IoError),
+    #[error("TCP socket error")]
+    SocketError(#[from] IoError),
     #[error("Empty TCP socket")]
     EmptySocket,
-    #[error("Packet serialization error: {0}")]
-    SerializationError(Box<ErrorKind>),
+    #[error("Socket codec error")]
+    CodecError(#[from] Box<ErrorKind>),
     #[error("Protocol mismatch")]
     ProtocolMismatch,
 }

diff --git a/spartan/src/node/replication/replica/mod.rs b/spartan/src/node/replication/replica/mod.rs
@@ -65,7 +65,7 @@ impl<'a> ReplicaSocket<'a> {
         Fut: Future<Output = ReplicaRequest<'a>>,
     {
         let buf = match self.socket.next().await {
-            Some(r) => r.map_err(ReplicaError::SerializationError)?,
+            Some(r) => r.map_err(ReplicaError::CodecError)?,
             None => return Err(ReplicaError::EmptySocket),
         };
 
@@ -79,11 +79,11 @@ impl<'a> ReplicaSocket<'a> {
         self.socket
             .send(Request::Replica(request))
             .await
-            .map_err(ReplicaError::SerializationError)?;
+            .map_err(ReplicaError::CodecError)?;
 
         SinkExt::<Request>::flush(&mut self.socket)
             .await
-            .map_err(ReplicaError::SerializationError)?;
+            .map_err(ReplicaError::CodecError)?;
 
         Ok(())
     }