Combine Miniscript conversion and constructor blocks

Combine the two impl blocks that contain constructors and conversion
functions.

Refactor only, no logic changes.

Author: tcharding

src/miniscript/mod.rs

@@ -95,6 +95,16 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
             phantom: PhantomData,
         }
     }
+
+    /// Extracts the `AstElem` representing the root of the miniscript
+    pub fn into_inner(self) -> Terminal<Pk, Ctx> {
+        self.node
+    }
+
+    /// Get a reference to the inner `AstElem` representing the root of miniscript
+    pub fn as_inner(&self) -> &Terminal<Pk, Ctx> {
+        &self.node
+    }
 }
 
 /// `PartialOrd` of `Miniscript` must depend only on node and not the type information.
@@ -150,18 +160,6 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> fmt::Display for Miniscript<Pk, Ctx>
     }
 }
 
-impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
-    /// Extracts the `AstElem` representing the root of the miniscript
-    pub fn into_inner(self) -> Terminal<Pk, Ctx> {
-        self.node
-    }
-
-    /// Get a reference to the inner `AstElem` representing the root of miniscript
-    pub fn as_inner(&self) -> &Terminal<Pk, Ctx> {
-        &self.node
-    }
-}
-
 impl<Ctx: ScriptContext> Miniscript<Ctx::Key, Ctx> {
     /// Attempt to parse an insane(scripts don't clear sanity checks)
     /// script into a Miniscript representation.