Remove PartialEq from Errors

xmtp · Apr 10, 2024 · efcddb4 · efcddb4
1 parent 1a3105b
commit efcddb4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 39 deletions.
diff --git a/xmtp_id/src/associations/association_log.rs b/xmtp_id/src/associations/association_log.rs
@@ -5,7 +5,7 @@ use super::state::AssociationState;
 
 use thiserror::Error;
 
-#[derive(Debug, Error, PartialEq)]
+#[derive(Debug, Error)]
 pub enum AssociationError {
     #[error("Error creating association {0}")]
     Generic(String),

diff --git a/xmtp_id/src/associations/builder.rs b/xmtp_id/src/associations/builder.rs
@@ -141,7 +141,7 @@ impl IdentityUpdateBuilder {
     }
 }
 
-#[derive(Debug, Error, PartialEq)]
+#[derive(Debug, Error)]
 pub enum SignatureRequestError {
     #[error("Unknown signer")]
     UnknownSigner,
@@ -434,9 +434,9 @@ mod tests {
             MockSignature::new_boxed(true, rand_string().into(), SignatureKind::Erc191, None),
         );
 
-        assert_eq!(
+        assert!(matches!(
             attempt_to_add_random_member,
             Err(SignatureRequestError::UnknownSigner)
-        );
+        ));
     }
 }
diff --git a/xmtp_id/src/associations/mod.rs b/xmtp_id/src/associations/mod.rs
@@ -233,8 +233,7 @@ mod tests {
             ..Default::default()
         });
         let update_result = apply_update(state, IdentityUpdate::new_test(vec![update]));
-        assert!(update_result.is_err());
-        assert_eq!(update_result.err().unwrap(), AssociationError::Replay);
+        assert!(matches!(update_result, Err(AssociationError::Replay)));
     }
 
     #[test]
@@ -285,11 +284,10 @@ mod tests {
         let state_result = get_state(vec![IdentityUpdate::new_test(vec![Action::CreateInbox(
             action,
         )])]);
-        assert!(state_result.is_err());
-        assert_eq!(
-            state_result.err().unwrap(),
-            AssociationError::Signature(SignatureError::Invalid)
-        );
+        assert!(matches!(
+            state_result,
+            Err(AssociationError::Signature(SignatureError::Invalid))
+        ));
     }
 
     #[test]
@@ -307,11 +305,7 @@ mod tests {
             initial_state.clone(),
             IdentityUpdate::new_test(vec![update_with_bad_existing_member]),
         );
-        assert!(update_result.is_err());
-        assert_eq!(
-            update_result.err().unwrap(),
-            AssociationError::Signature(SignatureError::Invalid)
-        );
+        assert!(matches!(update_result, Err(AssociationError::Signature(SignatureError::Invalid))));
 
         let update_with_bad_new_member = Action::AddAssociation(AddAssociation {
             new_member_signature: bad_signature.clone(),
@@ -328,11 +322,10 @@ mod tests {
             initial_state,
             IdentityUpdate::new_test(vec![update_with_bad_new_member]),
         );
-        assert!(update_result_2.is_err());
-        assert_eq!(
-            update_result_2.err().unwrap(),
-            AssociationError::Signature(SignatureError::Invalid)
-        );
+        assert!(matches!(
+            update_result_2,
+            Err(AssociationError::Signature(SignatureError::Invalid))
+        ));
     }
 
     #[test]
@@ -351,11 +344,10 @@ mod tests {
         });
 
         let state_result = get_state(vec![IdentityUpdate::new_test(vec![create_request, update])]);
-        assert!(state_result.is_err());
-        assert_eq!(
-            state_result.err().unwrap(),
-            AssociationError::MissingExistingMember
-        );
+        assert!(matches!(
+            state_result,
+            Err(AssociationError::MissingExistingMember)
+        ));
     }
 
     #[test]
@@ -383,13 +375,8 @@ mod tests {
         });
 
         let update_result = apply_update(existing_state, IdentityUpdate::new_test(vec![update]));
-        assert!(update_result.is_err());
-        assert_eq!(
-            update_result.err().unwrap(),
-            AssociationError::MemberNotAllowed(
-                MemberKind::Installation.to_string(),
-                MemberKind::Installation.to_string()
-            )
+        assert!(
+            matches!(update_result, Err(AssociationError::MemberNotAllowed(t1, t2)) if t1 == MemberKind::Installation.to_string() && t2 == MemberKind::Installation.to_string())
         );
     }
 
@@ -569,10 +556,9 @@ mod tests {
 
         let revoke_result =
             apply_update(new_state, IdentityUpdate::new_test(vec![attempted_revoke]));
-        assert!(revoke_result.is_err());
-        assert_eq!(
-            revoke_result.err().unwrap(),
-            AssociationError::MissingExistingMember
-        );
+        assert!(matches!(
+            revoke_result,
+            Err(AssociationError::MissingExistingMember)
+        ));
     }
 }
diff --git a/xmtp_id/src/associations/signature.rs b/xmtp_id/src/associations/signature.rs
@@ -2,7 +2,7 @@ use thiserror::Error;
 
 use super::MemberIdentifier;
 
-#[derive(Debug, Error, PartialEq)]
+#[derive(Debug, Error)]
 pub enum SignatureError {
     #[error("Signature validation failed")]
     Invalid,