core::address > impl Deserialize for Address

Cargo.toml

@@ -12,6 +12,7 @@ bincode = "1.3.3"
 bitcoin = "0.29.2"
 clap = "4.0.19"
 diff = "0.1.12"
+derive_more = "0.99"
 futures = "0.3.21"
 itertools = "0.10.3"
 lazy_static = "1.4.0"

src/core/address.rs

@@ -1,5 +1,5 @@
 use log::*;
-use serde::{Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use sha1::Sha1;
 use sha2::{Digest, Sha256};
 use std::{fmt::Display, str::FromStr};
@@ -52,6 +52,16 @@ impl Serialize for Address {
     }
 }
 
+impl<'de> Deserialize<'de> for Address {
+    fn deserialize<D>(deserializer: D) -> Result<Address, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        Address::from_str(&s).map_err(serde::de::Error::custom)
+    }
+}
+
 impl FromStr for Address {
     type Err = Error;
 
@@ -132,16 +142,16 @@ mod tests {
         assert_eq!(&address_hash, "1HELLo...2Ri9d");
     }
 
-    // #[test]
-    // fn test_deserialization() {
-    //     let result = serde_json::from_str("\"1HELLoE3sFD9569CLCbHEAVqvqV7U2Ri9d\"");
-    //     assert_eq!(result.is_ok(), true, "Encountered error: {:?}", result);
-    //     let address: Address = result.unwrap();
-    //     assert_eq!(
-    //         address,
-    //         Address {
-    //             address: String::from(ADDR)
-    //         }
-    //     );
-    // }
+    #[test]
+    fn test_deserialization() {
+        let result = serde_json::from_str("\"1HELLoE3sFD9569CLCbHEAVqvqV7U2Ri9d\"");
+        assert_eq!(result.is_ok(), true, "Encountered error: {:?}", result);
+        let address: Address = result.unwrap();
+        assert_eq!(
+            address,
+            Address {
+                address: String::from(ADDR)
+            }
+        );
+    }
 }

src/core/error.rs

@@ -1,7 +1,7 @@
 // use actix_http::error::ResponseError;
-// use derive_more::Display;
+use derive_more::Display;
 
-#[derive(Debug)]
+#[derive(Debug, Display)]
 pub enum Error {
     AddressError(String),
     SiteNotFound,