descriptor: implement Display

BP-WG · Jul 15, 2024 · 6f405ab · 6f405ab
1 parent 1fb4971
commit 6f405ab
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/descriptors/src/descriptor.rs b/descriptors/src/descriptor.rs
@@ -21,7 +21,8 @@
 // limitations under the License.
 
 use std::collections::{BTreeSet, HashMap};
-use std::iter;
+use std::fmt::{Display, Formatter};
+use std::{fmt, iter};
 
 use derive::{
     Bip340Sig, Derive, DeriveCompr, DeriveScripts, DeriveSet, DeriveXOnly, DerivedScript,
@@ -282,3 +283,17 @@ where Self: Derive<DerivedScript>
         }
     }
 }
+
+impl<S: DeriveSet> Display for StdDescr<S>
+where
+    S::Legacy: Display,
+    S::Compr: Display,
+    S::XOnly: Display,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            StdDescr::Wpkh(d) => Display::fmt(d, f),
+            StdDescr::TrKey(d) => Display::fmt(d, f),
+        }
+    }
+}
diff --git a/descriptors/src/segwit.rs b/descriptors/src/segwit.rs
@@ -21,6 +21,7 @@
 // limitations under the License.
 
 use std::collections::{BTreeSet, HashMap};
+use std::fmt::{self, Display, Formatter};
 use std::iter;
 
 use derive::{
@@ -96,3 +97,7 @@ impl<K: DeriveCompr> Descriptor<K> for Wpkh<K> {
         None
     }
 }
+
+impl<K: DeriveCompr + Display> Display for Wpkh<K> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { write!(f, "wpkh({})", self.0) }
+}
diff --git a/descriptors/src/taproot.rs b/descriptors/src/taproot.rs
@@ -21,6 +21,7 @@
 // limitations under the License.
 
 use std::collections::{BTreeSet, HashMap};
+use std::fmt::{self, Display, Formatter};
 use std::iter;
 
 use derive::{
@@ -99,6 +100,10 @@ impl<K: DeriveXOnly> Descriptor<K> for TrKey<K> {
     }
 }
 
+impl<K: DeriveXOnly + Display> Display for TrKey<K> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { write!(f, "tr({})", self.0) }
+}
+
 /*
 pub struct TrScript<K: DeriveXOnly> {
     internal_key: K,