fix: changes from review

maidsafe · May 3, 2021 · a95dbba · a95dbba
1 parent a8f625b
commit a95dbba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -25,7 +25,7 @@ pub enum Error {
     FailedSignature,
     #[error("Cannot route.")]
     CannotRoute,
-    #[error("empty recipient list")]
+    #[error("Empty recipient list")]
     EmptyRecipientList,
     #[error("The config is invalid")]
     InvalidConfig,

diff --git a/src/routing/comm.rs b/src/routing/comm.rs
@@ -223,9 +223,9 @@ impl Comm {
 
         if successes == delivery_group_size {
             if failed_recipients.is_empty() {
-                Ok(SendStatus::MinDeliveryGroupSizeReached(failed_recipients))
-            } else {
                 Ok(SendStatus::AllRecipients)
+            } else {
+                Ok(SendStatus::MinDeliveryGroupSizeReached(failed_recipients))
             }
         } else {
             Ok(SendStatus::MinDeliveryGroupSizeFailed(failed_recipients))
@@ -291,8 +291,7 @@ async fn handle_incoming_messages(
     }
 }
 
-/// Returns the status of the
-
+/// Returns the status of the send operation.
 #[derive(Debug, Clone)]
 pub enum SendStatus {
     AllRecipients,
@@ -346,10 +345,7 @@ mod tests {
             .send(&[peer0.addr, peer1.addr], 1, message.clone())
             .await?;
 
-        assert_matches!(
-            status,
-            SendStatus::AllRecipients | SendStatus::MinDeliveryGroupSizeReached(_)
-        );
+        assert_matches!(status, SendStatus::AllRecipients);
 
         assert_eq!(peer0.rx.recv().await, Some(message));
 
@@ -380,13 +376,9 @@ mod tests {
 
         assert_matches!(
             &status,
-            &SendStatus::MinDeliveryGroupSizeFailed(_)
+            &SendStatus::MinDeliveryGroupSizeFailed(_) => vec![invalid_addr]
         );
 
-        if let SendStatus::MinDeliveryGrupSizeFailed(ref failed_recipients) = status {
-            assert_eq!(&failed_recipients[..], &[invalid_addr]);
-        }
-
         Ok(())
     }
 
@@ -435,13 +427,9 @@ mod tests {
 
         assert_matches!(
             status,
-            SendStatus::MinDeliveryGroupSizeFailed(_)
+            SendStatus::MinDeliveryGroupSizeFailed(_) => vec![invalid_addr]
         );
-
-        if let SendStatus::MinDeliveryGroupSizeFailed(failed_recipients) = status.clone() {
-            assert_eq!(failed_recipients, [invalid_addr]);
-            assert_eq!(peer.rx.recv().await, Some(message));
-        }
+        assert_eq!(peer.rx.recv().await, Some(message));
 
         Ok(())
     }

diff --git a/src/routing/dispatcher.rs b/src/routing/dispatcher.rs
@@ -191,7 +191,7 @@ impl Dispatcher {
     ) -> Result<Vec<Command>> {
         let msg_bytes = message.serialize()?;
 
-        let cmds: Vec<Command> = match message {
+        let cmds = match message {
             MessageType::Ping | MessageType::NodeMessage(_) => {
                 let status = self
                     .comm