remove some no-op covenant conversions

It doesn't make sense to impl TranslateExt on objects that don't even
have any extensions in them.

Author: apoelstra

src/descriptor/bare.rs

@@ -25,13 +25,12 @@ use elements::{self, script, secp256k1_zkp, Script};
 use super::checksum::{desc_checksum, verify_checksum};
 use super::ELMTS_STR;
 use crate::expression::{self, FromTree};
-use crate::extensions::ExtParam;
 use crate::miniscript::context::ScriptContext;
 use crate::policy::{semantic, Liftable};
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
-    elementssig_to_rawsig, BareCtx, Error, Extension, ForEach, ForEachKey, Miniscript,
-    MiniscriptKey, Satisfier, ToPublicKey, TranslateExt, TranslatePk, Translator,
+    elementssig_to_rawsig, BareCtx, Error, ForEach, ForEachKey, Miniscript,
+    MiniscriptKey, Satisfier, ToPublicKey, TranslatePk, Translator,
 };
 
 /// Create a Bare Descriptor. That is descriptor that is
@@ -193,24 +192,6 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Bare<P> {
     }
 }
 
-impl<PExt, QExt, PArg, QArg, Pk> TranslateExt<PExt, QExt, PArg, QArg> for Bare<Pk>
-where
-    PExt: Extension,
-    QExt: Extension,
-    PArg: ExtParam,
-    QArg: ExtParam,
-    Pk: MiniscriptKey,
-{
-    type Output = Bare<Pk>;
-
-    fn translate_ext<T, E>(&self, _translator: &mut T) -> Result<Self::Output, E>
-    where
-        T: crate::ExtTranslator<PArg, QArg, E>,
-    {
-        Ok(self.clone())
-    }
-}
-
 /// A bare PkH descriptor at top level
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
 pub struct Pkh<Pk: MiniscriptKey> {
@@ -377,20 +358,3 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Pkh<P> {
     }
 }
 
-impl<PExt, QExt, PArg, QArg, Pk> TranslateExt<PExt, QExt, PArg, QArg> for Pkh<Pk>
-where
-    PExt: Extension,
-    QExt: Extension,
-    PArg: ExtParam,
-    QArg: ExtParam,
-    Pk: MiniscriptKey,
-{
-    type Output = Pkh<Pk>;
-
-    fn translate_ext<T, E>(&self, _translator: &mut T) -> Result<Self::Output, E>
-    where
-        T: crate::ExtTranslator<PArg, QArg, E>,
-    {
-        Ok(self.clone())
-    }
-}

src/descriptor/mod.rs

@@ -738,24 +738,12 @@ where
         T: ExtTranslator<PArg, QArg, E>,
     {
         let desc = match *self {
-            Descriptor::Bare(ref bare) => Descriptor::Bare(
-                TranslateExt::<CovenantExt<PArg>, CovenantExt<QArg>, _, _>::translate_ext(bare, t)?,
-            ),
-            Descriptor::Pkh(ref pk) => Descriptor::Pkh(
-                TranslateExt::<CovenantExt<PArg>, CovenantExt<QArg>, _, _>::translate_ext(pk, t)?,
-            ),
-            Descriptor::Wpkh(ref pk) => Descriptor::Wpkh(
-                TranslateExt::<CovenantExt<PArg>, CovenantExt<QArg>, _, _>::translate_ext(pk, t)?,
-            ),
-            Descriptor::Sh(ref sh) => Descriptor::Sh(
-                TranslateExt::<CovenantExt<PArg>, CovenantExt<QArg>, _, _>::translate_ext(sh, t)?,
-            ),
-            Descriptor::Wsh(ref wsh) => Descriptor::Wsh(
-                TranslateExt::<CovenantExt<PArg>, CovenantExt<QArg>, _, _>::translate_ext(wsh, t)?,
-            ),
-            Descriptor::Tr(ref tr) => Descriptor::Tr(
-                TranslateExt::<NoExt, NoExt, _, _>::translate_ext(tr, t)?,
-            ),
+            Descriptor::Bare(ref bare) => Descriptor::Bare(bare.clone()),
+            Descriptor::Pkh(ref pk) => Descriptor::Pkh(pk.clone()),
+            Descriptor::Wpkh(ref pk) => Descriptor::Wpkh(pk.clone()),
+            Descriptor::Sh(ref sh) => Descriptor::Sh(sh.clone()),
+            Descriptor::Wsh(ref wsh) => Descriptor::Wsh(wsh.clone()),
+            Descriptor::Tr(ref tr) => Descriptor::Tr(tr.clone()),
             Descriptor::TrExt(ref tr) => Descriptor::TrExt(
                 TranslateExt::<CovenantExt<PArg>, CovenantExt<QArg>, _, _>::translate_ext(tr, t)?,
             ),

src/descriptor/segwitv0.rs

@@ -24,13 +24,12 @@ use elements::{self, secp256k1_zkp, Address, Script};
 use super::checksum::{desc_checksum, verify_checksum};
 use super::{SortedMultiVec, ELMTS_STR};
 use crate::expression::{self, FromTree};
-use crate::extensions::ExtParam;
 use crate::miniscript::context::{ScriptContext, ScriptContextError};
 use crate::policy::{semantic, Liftable};
 use crate::util::varint_len;
 use crate::{
-    elementssig_to_rawsig, Error, Extension, ForEach, ForEachKey, Miniscript, MiniscriptKey,
-    Satisfier, Segwitv0, ToPublicKey, TranslateExt, TranslatePk, Translator,
+    elementssig_to_rawsig, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey,
+    Satisfier, Segwitv0, ToPublicKey, TranslatePk, Translator,
 };
 /// A Segwitv0 wsh descriptor
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
@@ -310,24 +309,6 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Wsh<P> {
     }
 }
 
-impl<PExt, QExt, PArg, QArg, Pk> TranslateExt<PExt, QExt, PArg, QArg> for Wsh<Pk>
-where
-    PExt: Extension,
-    QExt: Extension,
-    PArg: ExtParam,
-    QArg: ExtParam,
-    Pk: MiniscriptKey,
-{
-    type Output = Wsh<Pk>;
-
-    fn translate_ext<T, E>(&self, _translator: &mut T) -> Result<Self::Output, E>
-    where
-        T: crate::ExtTranslator<PArg, QArg, E>,
-    {
-        Ok(self.clone())
-    }
-}
-
 /// A bare Wpkh descriptor at top level
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
 pub struct Wpkh<Pk: MiniscriptKey> {
@@ -539,20 +520,3 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Wpkh<P> {
     }
 }
 
-impl<PExt, QExt, PArg, QArg, Pk> TranslateExt<PExt, QExt, PArg, QArg> for Wpkh<Pk>
-where
-    PExt: Extension,
-    QExt: Extension,
-    PArg: ExtParam,
-    QArg: ExtParam,
-    Pk: MiniscriptKey,
-{
-    type Output = Wpkh<Pk>;
-
-    fn translate_ext<T, E>(&self, _translator: &mut T) -> Result<Self::Output, E>
-    where
-        T: crate::ExtTranslator<PArg, QArg, E>,
-    {
-        Ok(self.clone())
-    }
-}

src/descriptor/sh.rs

@@ -25,13 +25,12 @@ use elements::{self, script, secp256k1_zkp, Script};
 use super::checksum::{desc_checksum, verify_checksum};
 use super::{SortedMultiVec, Wpkh, Wsh, ELMTS_STR};
 use crate::expression::{self, FromTree};
-use crate::extensions::ExtParam;
 use crate::miniscript::context::ScriptContext;
 use crate::policy::{semantic, Liftable};
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
-    push_opcode_size, Error, Extension, ForEach, ForEachKey, Legacy, Miniscript, MiniscriptKey,
-    Satisfier, Segwitv0, ToPublicKey, TranslateExt, TranslatePk, Translator,
+    push_opcode_size, Error, ForEach, ForEachKey, Legacy, Miniscript, MiniscriptKey,
+    Satisfier, Segwitv0, ToPublicKey, TranslatePk, Translator,
 };
 
 /// A Legacy p2sh Descriptor
@@ -405,20 +404,3 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Sh<P> {
     }
 }
 
-impl<PExt, QExt, PArg, QArg, Pk> TranslateExt<PExt, QExt, PArg, QArg> for Sh<Pk>
-where
-    PExt: Extension,
-    QExt: Extension,
-    PArg: ExtParam,
-    QArg: ExtParam,
-    Pk: MiniscriptKey,
-{
-    type Output = Sh<Pk>;
-
-    fn translate_ext<T, E>(&self, _translator: &mut T) -> Result<Self::Output, E>
-    where
-        T: crate::ExtTranslator<PArg, QArg, E>,
-    {
-        Ok(self.clone())
-    }
-}