Fix compiler test cases for new typing rules

Author: sanket1729

integration_test/random_ms.txt

@@ -13,7 +13,7 @@ j:and_v(v:ripemd160(H),or_d(sha256(H),older(16)))
 and_b(hash256(H),a:and_b(hash256(H),a:older(1)))
 thresh(2,multi(2,03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),a:multi(1,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),ac:pk_k(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01))
 and_n(sha256(H),t:or_i(v:older(4252898),v:older(16)))
-or_d(d:and_v(v:older(4252898),v:older(4252898)),sha256(H))
+or_d(nd:and_v(v:older(4252898),v:older(4252898)),sha256(H))
 c:and_v(or_c(sha256(H),v:multi(1,02c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db)),pk_k(03acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbe))
 c:and_v(or_c(multi(2,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00,02352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5),v:ripemd160(H)),pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))
 and_v(andor(hash256(H),v:hash256(H),v:older(50000)),after(1231488000))

src/policy/compiler.rs

@@ -1166,13 +1166,13 @@ mod tests {
     use std::str::FromStr;
     use std::string::String;
 
-    use miniscript::{satisfy, Legacy, Segwitv0};
+    use miniscript::{satisfy, Legacy, Segwitv0, Tap};
     use policy::Liftable;
     use script_num_size;
 
     type SPolicy = Concrete<String>;
     type BPolicy = Concrete<bitcoin::PublicKey>;
-    type DummySegwitAstElemExt = policy::compiler::AstElemExt<String, Segwitv0>;
+    type DummyTapAstElemExt = policy::compiler::AstElemExt<String, Tap>;
     type SegwitMiniScript = Miniscript<bitcoin::PublicKey, Segwitv0>;
 
     fn pubkeys_and_a_sig(n: usize) -> (Vec<bitcoin::PublicKey>, secp256k1::ecdsa::Signature) {
@@ -1262,7 +1262,7 @@ mod tests {
     #[test]
     fn compile_q() {
         let policy = SPolicy::from_str("or(1@and(pk(A),pk(B)),127@pk(C))").expect("parsing");
-        let compilation: DummySegwitAstElemExt =
+        let compilation: DummyTapAstElemExt =
             best_t(&mut BTreeMap::new(), &policy, 1.0, None).unwrap();
 
         assert_eq!(compilation.cost_1d(1.0, None), 88.0 + 74.109375);
@@ -1271,13 +1271,14 @@ mod tests {
             compilation.ms.lift().unwrap().sorted()
         );
 
+        // compile into taproot context to avoid limit errors
         let policy = SPolicy::from_str(
                 "and(and(and(or(127@thresh(2,pk(A),pk(B),thresh(2,or(127@pk(A),1@pk(B)),after(100),or(and(pk(C),after(200)),and(pk(D),sha256(66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925))),pk(E))),1@pk(F)),sha256(66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925)),or(127@pk(G),1@after(300))),or(127@after(400),pk(H)))"
             ).expect("parsing");
-        let compilation: DummySegwitAstElemExt =
+        let compilation: DummyTapAstElemExt =
             best_t(&mut BTreeMap::new(), &policy, 1.0, None).unwrap();
 
-        assert_eq!(compilation.cost_1d(1.0, None), 437.0 + 299.4003295898438);
+        assert_eq!(compilation.cost_1d(1.0, None), 438.0 + 299.4003295898438);
         assert_eq!(
             policy.lift().unwrap().sorted(),
             compilation.ms.lift().unwrap().sorted()
@@ -1563,9 +1564,9 @@ mod benches {
     use test::{black_box, Bencher};
 
     use super::{CompilerError, Concrete};
-    use miniscript::Segwitv0;
+    use miniscript::Tap;
     use Miniscript;
-    type SegwitMsRes = Result<Miniscript<String, Segwitv0>, CompilerError>;
+    type TapMsRes = Result<Miniscript<String, Tap>, CompilerError>;
     #[bench]
     pub fn compile_basic(bh: &mut Bencher) {
         let h = (0..64).map(|_| "a").collect::<String>();
@@ -1575,7 +1576,7 @@ mod benches {
         ))
         .expect("parsing");
         bh.iter(|| {
-            let pt: SegwitMsRes = pol.compile();
+            let pt: TapMsRes = pol.compile();
             black_box(pt).unwrap();
         });
     }
@@ -1587,7 +1588,7 @@ mod benches {
             &format!("or(pk(L),thresh(9,sha256({}),pk(A),pk(B),and(or(pk(C),pk(D)),pk(E)),after(100),pk(F),pk(G),pk(H),pk(I),and(pk(J),pk(K))))", h)
         ).expect("parsing");
         bh.iter(|| {
-            let pt: SegwitMsRes = pol.compile();
+            let pt: TapMsRes = pol.compile();
             black_box(pt).unwrap();
         });
     }
@@ -1598,7 +1599,7 @@ mod benches {
             "or(pk(A),thresh(4,pk(B),older(100),pk(C),and(after(100),or(pk(D),or(pk(E),and(pk(F),thresh(2,pk(G),or(pk(H),and(thresh(5,pk(I),or(pk(J),pk(K)),pk(L),pk(M),pk(N),pk(O),pk(P),pk(Q),pk(R),pk(S),pk(T)),pk(U))),pk(V),or(and(pk(W),pk(X)),pk(Y)),after(100)))))),pk(Z)))"
         ).expect("parsing");
         bh.iter(|| {
-            let pt: SegwitMsRes = pol.compile();
+            let pt: TapMsRes = pol.compile();
             black_box(pt).unwrap();
         });
     }