Delete the pretaproot module

In preparation for removing the `DescriptorTrait` remove the pretaproot
module. This is possible because removing the trait will resolve the
error return issues that the taproot module exists to solve.

Author: tcharding

src/descriptor/mod.rs

@@ -40,9 +40,6 @@ use crate::{
     ToPublicKey, TranslatePk, 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;
@@ -398,43 +395,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};
-    /// 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");
-    ///
-    /// // Now the script code and explicit script no longer fail on longer fail
-    /// // on PreTaprootDescriptor using PreTaprootDescriptorTrait
-    /// let script_code = pre_tap_desc.script_code();
-    /// assert_eq!(script_code.to_string(),
-    ///     "Script(OP_DUP OP_HASH160 OP_PUSHBYTES_20 62107d047e8818b594303fe0657388cc4fc8771f OP_EQUALVERIFY OP_CHECKSIG)"
-    /// );
-    /// ```
-    ///
-    /// # 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, Q> TranslatePk<P, Q> for Descriptor<P>

src/descriptor/pretaproot.rs

@@ -114,8 +114,6 @@ use std::{error, fmt, hash, str};
 use bitcoin::blockdata::{opcodes, script};
 use bitcoin::hashes::{hash160, sha256, Hash};
 
-pub use crate::descriptor::pretaproot::traits::PreTaprootDescriptorTrait;
-pub use crate::descriptor::pretaproot::PreTaprootDescriptor;
 pub use crate::descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait};
 pub use crate::interpreter::Interpreter;
 pub use crate::miniscript::context::{BareCtx, Legacy, ScriptContext, Segwitv0, Tap};