Remove the pretaproot module

Now that the `PreTaprootDescriptorTrait` trait is empty and all error
handling of the `DescriptorTrait` methods is handled more cleanly we can
remove the `pretaproot` module all together.

The `pretaproot` module has no test code, integration tests, or examples
so I do not know if this breaks anything?

Author: tcharding

src/descriptor/mod.rs

@@ -43,9 +43,6 @@ use crate::{
     TranslatePk2,
 };
 
-// Directly export from lib.rs, exporting the trait here causes conflicts in this file
-pub(crate) mod pretaproot;
-
 mod bare;
 mod segwitv0;
 mod sh;
@@ -448,36 +445,6 @@ impl<Pk: MiniscriptKey> Descriptor<Pk> {
             Descriptor::Tr(ref _tr) => DescriptorType::Tr,
         }
     }
-
-    /// .
-    /// Convert a Descriptor into [`pretaproot::PreTaprootDescriptor`]
-    /// # Examples
-    ///
-    /// ```
-    /// use std::str::FromStr;
-    /// use miniscript::descriptor::Descriptor;
-    /// use miniscript::{PreTaprootDescriptor, PreTaprootDescriptorTrait, ScriptCode};
-    /// use miniscript::bitcoin;
-    ///
-    /// // A descriptor with a string generic
-    /// let desc = Descriptor::<bitcoin::PublicKey>::from_str("wpkh(02e18f242c8b0b589bfffeac30e1baa80a60933a649c7fb0f1103e78fbf58aa0ed)")
-    ///     .expect("Valid segwitv0 descriptor");
-    /// let pre_tap_desc = desc.into_pre_taproot_desc().expect("Wsh is pre taproot");
-    /// ```
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if descriptor is not a pre taproot descriptor.
-    pub fn into_pre_taproot_desc(self) -> Result<pretaproot::PreTaprootDescriptor<Pk>, Self> {
-        match self {
-            Descriptor::Bare(bare) => Ok(pretaproot::PreTaprootDescriptor::Bare(bare)),
-            Descriptor::Pkh(pkh) => Ok(pretaproot::PreTaprootDescriptor::Pkh(pkh)),
-            Descriptor::Wpkh(wpkh) => Ok(pretaproot::PreTaprootDescriptor::Wpkh(wpkh)),
-            Descriptor::Sh(sh) => Ok(pretaproot::PreTaprootDescriptor::Sh(sh)),
-            Descriptor::Wsh(wsh) => Ok(pretaproot::PreTaprootDescriptor::Wsh(wsh)),
-            Descriptor::Tr(tr) => Err(Descriptor::Tr(tr)),
-        }
-    }
 }
 
 impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Descriptor<P> {

src/descriptor/pretaproot.rs

@@ -131,8 +131,6 @@ pub use crate::miniscript::decode::Terminal;
 pub use crate::miniscript::satisfy::{Preimage32, Satisfier};
 pub use crate::miniscript::Miniscript;
 
-pub use crate::descriptor::pretaproot::{traits::PreTaprootDescriptorTrait, PreTaprootDescriptor};
-
 ///Public key trait which can be converted to Hash type
 pub trait MiniscriptKey: Clone + Eq + Ord + fmt::Debug + fmt::Display + hash::Hash {
     /// Returns true if the pubkey is uncompressed. Defaults to `false`.