refactor address tests to use results

src/addressing.rs

@@ -139,60 +139,45 @@ pub trait Addressable: Hashable {
 
 #[cfg(test)]
 mod tests {
+    use anyhow::Result;
     use uuid::Uuid;
 
     use crate::addressing::Address;
     use crate::util::hash::Hash;
 
     #[test]
-    fn test_hash_codec() {
+    fn test_hash_codec() -> Result<()> {
         let addr = Address::Hash(Hash(vec![1, 2, 3, 4, 5]));
-
-        let encoded = addr.encode();
-        assert!(encoded.is_ok());
-
-        let decoded = Address::decode(&encoded.unwrap());
-        assert!(decoded.is_ok());
-
-        assert_eq!(addr, decoded.unwrap());
+        let encoded = addr.encode()?;
+        let decoded = Address::decode(&encoded)?;
+        assert_eq!(addr, decoded);
+        Ok(())
     }
 
     #[test]
-    fn test_uuid_codec() {
+    fn test_uuid_codec() -> Result<()> {
         let addr = Address::Uuid(Uuid::new_v4());
-
-        let encoded = addr.encode();
-        assert!(encoded.is_ok());
-
-        let decoded = Address::decode(&encoded.unwrap());
-        assert!(decoded.is_ok());
-
-        assert_eq!(addr, decoded.unwrap());
+        let encoded = addr.encode()?;
+        let decoded = Address::decode(&encoded)?;
+        assert_eq!(addr, decoded);
+        Ok(())
     }
 
     #[test]
-    fn test_attribute_codec() {
+    fn test_attribute_codec() -> Result<()> {
         let addr = Address::Attribute(String::from("ATTRIBUTE"));
-
-        let encoded = addr.encode();
-        assert!(encoded.is_ok());
-
-        let decoded = Address::decode(&encoded.unwrap());
-        assert!(decoded.is_ok());
-
-        assert_eq!(addr, decoded.unwrap());
+        let encoded = addr.encode()?;
+        let decoded = Address::decode(&encoded)?;
+        assert_eq!(addr, decoded);
+        Ok(())
     }
 
     #[test]
-    fn test_url_codec() {
+    fn test_url_codec() -> Result<()> {
         let addr = Address::Url(String::from("https://upendproject.net"));
-
-        let encoded = addr.encode();
-        assert!(encoded.is_ok());
-
-        let decoded = Address::decode(&encoded.unwrap());
-        assert!(decoded.is_ok());
-
-        assert_eq!(addr, decoded.unwrap());
+        let encoded = addr.encode()?;
+        let decoded = Address::decode(&encoded)?;
+        assert_eq!(addr, decoded);
+        Ok(())
     }
 }