Merge pull request #231 from sanket1729/add_inners

[descriptors] Expose inner

Author: apoelstra

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "miniscript"
-version = "5.0.1"
+version = "5.0.2"
 authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>, Sanket Kanjalkar <sanket1729@gmail.com>"]
 repository = "https://github.com/apoelstra/miniscript"
 description = "Miniscript: a subset of Bitcoin Script designed for analysis"

src/descriptor/bare.rs

@@ -52,6 +52,11 @@ impl<Pk: MiniscriptKey> Bare<Pk> {
         Ok(Self { ms: ms })
     }
 
+    /// get the inner
+    pub fn into_inner(self) -> Miniscript<Pk, BareCtx> {
+        self.ms
+    }
+
     /// get the inner
     pub fn as_inner(&self) -> &Miniscript<Pk, BareCtx> {
         &self.ms
@@ -211,10 +216,15 @@ impl<Pk: MiniscriptKey> Pkh<Pk> {
         Self { pk: pk }
     }
 
-    /// Get the inner key
+    /// Get a reference to the inner key
     pub fn as_inner(&self) -> &Pk {
         &self.pk
     }
+
+    /// Get the inner key
+    pub fn into_inner(self) -> Pk {
+        self.pk
+    }
 }
 
 impl<Pk: MiniscriptKey> fmt::Debug for Pkh<Pk> {

src/descriptor/segwitv0.rs

@@ -41,6 +41,16 @@ pub struct Wsh<Pk: MiniscriptKey> {
 }
 
 impl<Pk: MiniscriptKey> Wsh<Pk> {
+    /// Get the Inner
+    pub fn into_inner(self) -> WshInner<Pk> {
+        self.inner
+    }
+
+    /// Get a reference to inner
+    pub fn as_inner(&self) -> &WshInner<Pk> {
+        &self.inner
+    }
+
     /// Create a new wsh descriptor
     pub fn new(ms: Miniscript<Pk, Segwitv0>) -> Result<Self, Error> {
         // do the top-level checks
@@ -59,11 +69,6 @@ impl<Pk: MiniscriptKey> Wsh<Pk> {
         })
     }
 
-    /// Get the inner key
-    pub fn as_inner(&self) -> &WshInner<Pk> {
-        &self.inner
-    }
-
     /// Get the descriptor without the checksum
     pub fn to_string_no_checksum(&self) -> String {
         match self.inner {
@@ -294,6 +299,11 @@ impl<Pk: MiniscriptKey> Wpkh<Pk> {
         }
     }
 
+    /// Get the inner key
+    pub fn into_inner(self) -> Pk {
+        self.pk
+    }
+
     /// Get the inner key
     pub fn as_inner(&self) -> &Pk {
         &self.pk

src/descriptor/sh.rs

@@ -46,7 +46,7 @@ pub struct Sh<Pk: MiniscriptKey> {
 
 /// Sh Inner
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
-enum ShInner<Pk: MiniscriptKey> {
+pub enum ShInner<Pk: MiniscriptKey> {
     /// Nested Wsh
     Wsh(Wsh<Pk>),
     /// Nested Wpkh
@@ -139,6 +139,16 @@ where
 }
 
 impl<Pk: MiniscriptKey> Sh<Pk> {
+    /// Get the Inner
+    pub fn into_inner(self) -> ShInner<Pk> {
+        self.inner
+    }
+
+    /// Get a reference to inner
+    pub fn as_inner(&self) -> &ShInner<Pk> {
+        &self.inner
+    }
+
     /// Create a new p2sh descriptor with the raw miniscript
     pub fn new(ms: Miniscript<Pk, Legacy>) -> Result<Self, Error> {
         // do the top-level checks