Merge #101: Make ScriptStatus Serializable

80b2ade Make ScriptStatus Serializable (Riccardo Casatta)

Pull request description:

  it's common to cache this value client side, so making it Serializable simplify things downstream

ACKs for top commit:
  afilini:
    ACK 80b2ade

Tree-SHA512: 9467b4f2ee24ee2a684931df31607135f44c624f65d7d3ee64b3991a06de73a07475e4d1a4b8062093500e6a7cb47c1b2ebf094596fca33bf4cc54b26851b910

Author: afilini

src/types.rs

@@ -9,7 +9,7 @@ use std::sync::Arc;
 
 use bitcoin::blockdata::block;
 use bitcoin::consensus::encode::deserialize;
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::{sha256, Hash};
 use bitcoin::{Script, Txid};
 
@@ -69,8 +69,8 @@ impl<'a> Request<'a> {
 }
 
 #[doc(hidden)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize)]
-pub struct Hex32Bytes(#[serde(deserialize_with = "from_hex")] [u8; 32]);
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub struct Hex32Bytes(#[serde(deserialize_with = "from_hex", serialize_with = "to_hex")] [u8; 32]);
 
 impl Deref for Hex32Bytes {
     type Target = [u8; 32];
@@ -118,6 +118,13 @@ where
     T::from_hex(&s).map_err(de::Error::custom)
 }
 
+fn to_hex<S>(bytes: &[u8], serializer: S) -> std::result::Result<S::Ok, S::Error>
+where
+    S: serde::ser::Serializer,
+{
+    serializer.serialize_str(&bytes.to_hex())
+}
+
 fn from_hex_array<'de, T, D>(deserializer: D) -> Result<Vec<T>, D::Error>
 where
     T: FromHex + std::fmt::Debug,
@@ -388,3 +395,16 @@ impl From<std::sync::mpsc::RecvError> for Error {
         Error::Mpsc
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::ScriptStatus;
+
+    #[test]
+    fn script_status_roundtrip() {
+        let script_status: ScriptStatus = [1u8; 32].into();
+        let script_status_json = serde_json::to_string(&script_status).unwrap();
+        let script_status_back = serde_json::from_str(&script_status_json).unwrap();
+        assert_eq!(script_status, script_status_back);
+    }
+}