tr.rs: add checksum checks and Display refactor for Tr

Author: SarcasticNastik

src/descriptor/mod.rs

@@ -1105,7 +1105,7 @@ mod tests {
     #[test]
     fn tr_roundtrip_key() {
         let script = Tr::<DummyKey>::from_str("tr()").unwrap().to_string();
-        assert_eq!(script, format!("tr()"))
+        assert_eq!(script, format!("tr()#x4ml3kxd"))
     }
 
     #[test]
@@ -1114,7 +1114,7 @@ mod tests {
             .unwrap()
             .to_string();
 
-        assert_eq!(descriptor, "tr(,{pk(),pk()})")
+        assert_eq!(descriptor, "tr(,{pk(),pk()})#7dqr6v8r")
     }
 
     #[test]
@@ -1123,7 +1123,7 @@ mod tests {
             .unwrap()
             .to_string();
 
-        assert_eq!(descriptor, "tr(,{pk(),{pk(),or_d(pk(),pkh())}})",)
+        assert_eq!(descriptor, "tr(,{pk(),{pk(),or_d(pk(),pkh())}})#39ke346g")
     }
 
     #[test]

src/descriptor/tr.rs

@@ -1,9 +1,6 @@
 // Tapscript
 
-// use super::{
-//     checksum::{desc_checksum, verify_checksum},
-//     DescriptorTrait,
-// };
+use super::checksum::{desc_checksum, verify_checksum};
 use bitcoin::hashes::_export::_core::fmt::Formatter;
 use errstr;
 use expression::{self, FromTree, Tree};
@@ -50,8 +47,6 @@ where
 {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         let desc = self.to_string_no_checksum();
-        // let checksum = desc_checksum(&desc).map_err(|_| fmt::Error)?;
-        // write!(f, "{}#{}", &desc, &checksum)
         write!(f, "{}", &desc)
     }
 }
@@ -110,6 +105,14 @@ where
             }
         }
     }
+
+    pub fn to_string_no_checksum(&self) -> String {
+        let key = &self.key_path;
+        match self.script_path {
+            Some(ref s) => format!("tr({},{})", key, s),
+            None => format!("tr({})", key),
+        }
+    }
 }
 
 impl<Pk: MiniscriptKey> FromTree for Tr<Pk>
@@ -178,11 +181,8 @@ where
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        // let desc_str = verify_checksum(s)?;
-        // let top = expression::Tree::from_str(desc_str)?;
-
-        // Pass the TapTree then
-        let top = parse_tr(s)?;
+        let desc_str = verify_checksum(s)?;
+        let top = parse_tr(desc_str)?;
         Self::from_tree(&top) // parse taptree and tapscript differently
     }
 }
@@ -195,11 +195,9 @@ where
     <<Pk as MiniscriptKey>::Hash as FromStr>::Err: ToString,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let key = &self.key_path;
-        match self.script_path {
-            Some(ref s) => write!(f, "tr({},{})", key, s),
-            None => write!(f, "tr({})", key),
-        }
+        let desc = self.to_string_no_checksum();
+        let checksum = desc_checksum(&desc).map_err(|_| fmt::Error)?;
+        write!(f, "{}#{}", &desc, &checksum)
     }
 }