Remove unnecessary path from Terminal

The `Terminal` type as unambiguous, no need to qualify it.

Author: tcharding

src/descriptor/mod.rs

@@ -22,11 +22,12 @@ use bitcoin::{secp256k1, Address, Network, Script, ScriptBuf, TxIn, Witness};
 use sync::Arc;
 
 use self::checksum::verify_checksum;
+use crate::miniscript::decode::Terminal;
 use crate::miniscript::{Legacy, Miniscript, Segwitv0};
 use crate::prelude::*;
 use crate::{
-    expression, hash256, miniscript, BareCtx, Error, ForEachKey, MiniscriptKey, Satisfier,
-    ToPublicKey, TranslateErr, TranslatePk, Translator,
+    expression, hash256, BareCtx, Error, ForEachKey, MiniscriptKey, Satisfier, ToPublicKey,
+    TranslateErr, TranslatePk, Translator,
 };
 
 mod bare;
@@ -167,12 +168,10 @@ impl<Pk: MiniscriptKey> Descriptor<Pk> {
     /// Create a new pk descriptor
     pub fn new_pk(pk: Pk) -> Self {
         // roundabout way to constuct `c:pk_k(pk)`
-        let ms: Miniscript<Pk, BareCtx> =
-            Miniscript::from_ast(miniscript::decode::Terminal::Check(Arc::new(
-                Miniscript::from_ast(miniscript::decode::Terminal::PkK(pk))
-                    .expect("Type check cannot fail"),
-            )))
-            .expect("Type check cannot fail");
+        let ms: Miniscript<Pk, BareCtx> = Miniscript::from_ast(Terminal::Check(Arc::new(
+            Miniscript::from_ast(Terminal::PkK(pk)).expect("Type check cannot fail"),
+        )))
+        .expect("Type check cannot fail");
         Descriptor::Bare(Bare::new(ms).expect("Context checks cannot fail for p2pk"))
     }
 

src/descriptor/sortedmulti.rs

@@ -17,8 +17,8 @@ use crate::miniscript::decode::Terminal;
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
 use crate::prelude::*;
 use crate::{
-    errstr, expression, miniscript, policy, script_num_size, Error, ForEachKey, Miniscript,
-    MiniscriptKey, Satisfier, ToPublicKey, TranslateErr, Translator,
+    errstr, expression, policy, script_num_size, Error, ForEachKey, Miniscript, MiniscriptKey,
+    Satisfier, ToPublicKey, TranslateErr, Translator,
 };
 
 /// Contents of a "sortedmulti" descriptor
@@ -45,7 +45,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
         // Check the limits before creating a new SortedMultiVec
         // For example, under p2sh context the scriptlen can only be
         // upto 520 bytes.
-        let term: miniscript::decode::Terminal<Pk, Ctx> = Terminal::Multi(k, pks.clone());
+        let term: Terminal<Pk, Ctx> = Terminal::Multi(k, pks.clone());
         let ms = Miniscript::from_ast(term)?;
 
         // This would check all the consensus rules for p2sh/p2wsh and
@@ -226,9 +226,9 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> fmt::Display for SortedMultiVec<Pk,
 #[cfg(test)]
 mod tests {
     use bitcoin::secp256k1::PublicKey;
-    use miniscript::context::Legacy;
 
     use super::*;
+    use crate::miniscript::context::Legacy;
 
     #[test]
     fn too_many_pubkeys() {