compiler: use Miniscript terminal constructors directly

This eliminates some expect()s and is plausibly faster.

Author: apoelstra

src/policy/compiler.rs

@@ -520,11 +520,8 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> AstElemExt<Pk, Ctx> {
 }
 
 impl<Pk: MiniscriptKey, Ctx: ScriptContext> AstElemExt<Pk, Ctx> {
-    fn terminal(ast: Terminal<Pk, Ctx>) -> AstElemExt<Pk, Ctx> {
-        AstElemExt {
-            comp_ext_data: CompilerExtData::type_check(&ast),
-            ms: Arc::new(Miniscript::from_ast(ast).expect("Terminal creation must always succeed")),
-        }
+    fn terminal(ms: Miniscript<Pk, Ctx>) -> AstElemExt<Pk, Ctx> {
+        AstElemExt { comp_ext_data: CompilerExtData::type_check(ms.as_inner()), ms: Arc::new(ms) }
     }
 
     fn binary(
@@ -817,29 +814,29 @@ where
 
     match *policy {
         Concrete::Unsatisfiable => {
-            insert_wrap!(AstElemExt::terminal(Terminal::False));
+            insert_wrap!(AstElemExt::terminal(Miniscript::FALSE));
         }
         Concrete::Trivial => {
-            insert_wrap!(AstElemExt::terminal(Terminal::True));
+            insert_wrap!(AstElemExt::terminal(Miniscript::TRUE));
         }
         Concrete::Key(ref pk) => {
-            insert_wrap!(AstElemExt::terminal(Terminal::PkH(pk.clone())));
-            insert_wrap!(AstElemExt::terminal(Terminal::PkK(pk.clone())));
+            insert_wrap!(AstElemExt::terminal(Miniscript::pk_h(pk.clone())));
+            insert_wrap!(AstElemExt::terminal(Miniscript::pk_k(pk.clone())));
         }
-        Concrete::After(n) => insert_wrap!(AstElemExt::terminal(Terminal::After(n))),
-        Concrete::Older(n) => insert_wrap!(AstElemExt::terminal(Terminal::Older(n))),
+        Concrete::After(n) => insert_wrap!(AstElemExt::terminal(Miniscript::after(n))),
+        Concrete::Older(n) => insert_wrap!(AstElemExt::terminal(Miniscript::older(n))),
         Concrete::Sha256(ref hash) => {
-            insert_wrap!(AstElemExt::terminal(Terminal::Sha256(hash.clone())))
+            insert_wrap!(AstElemExt::terminal(Miniscript::sha256(hash.clone())))
         }
         // Satisfaction-cost + script-cost
         Concrete::Hash256(ref hash) => {
-            insert_wrap!(AstElemExt::terminal(Terminal::Hash256(hash.clone())))
+            insert_wrap!(AstElemExt::terminal(Miniscript::hash256(hash.clone())))
         }
         Concrete::Ripemd160(ref hash) => {
-            insert_wrap!(AstElemExt::terminal(Terminal::Ripemd160(hash.clone())))
+            insert_wrap!(AstElemExt::terminal(Miniscript::ripemd160(hash.clone())))
         }
         Concrete::Hash160(ref hash) => {
-            insert_wrap!(AstElemExt::terminal(Terminal::Hash160(hash.clone())))
+            insert_wrap!(AstElemExt::terminal(Miniscript::hash160(hash.clone())))
         }
         Concrete::And(ref subs) => {
             assert_eq!(subs.len(), 2, "and takes 2 args");
@@ -859,7 +856,7 @@ where
             let mut zero_comp = BTreeMap::new();
             zero_comp.insert(
                 CompilationKey::from_type(Type::FALSE, ExtData::FALSE.has_free_verify, dissat_prob),
-                AstElemExt::terminal(Terminal::False),
+                AstElemExt::terminal(Miniscript::FALSE),
             );
             compile_tern!(&mut left, &mut q_zero_right, &mut zero_comp, [1.0, 0.0]);
             compile_tern!(&mut right, &mut q_zero_left, &mut zero_comp, [1.0, 0.0]);
@@ -1046,12 +1043,12 @@ where
                 match Ctx::sig_type() {
                     SigType::Schnorr => {
                         if let Ok(pk_thresh) = pk_thresh.set_maximum() {
-                            insert_wrap!(AstElemExt::terminal(Terminal::MultiA(pk_thresh)))
+                            insert_wrap!(AstElemExt::terminal(Miniscript::multi_a(pk_thresh)))
                         }
                     }
                     SigType::Ecdsa => {
                         if let Ok(pk_thresh) = pk_thresh.set_maximum() {
-                            insert_wrap!(AstElemExt::terminal(Terminal::Multi(pk_thresh)))
+                            insert_wrap!(AstElemExt::terminal(Miniscript::multi(pk_thresh)))
                         }
                     }
                 }