Merge pull request #75 from kiminuo/feature/issue_67

Fix roundtrip_miniscript_script that fails on `006400675168`

Author: apoelstra

src/descriptor/mod.rs

@@ -542,9 +542,7 @@ mod tests {
 
     type StdDescriptor = Descriptor<PublicKey>;
     const TEST_PK: &'static str =
-        "pk(\
-         020000000000000000000000000000000000000000000000000000000000000002\
-         )";
+        "pk(020000000000000000000000000000000000000000000000000000000000000002)";
 
     #[test]
     fn parse_descriptor() {

src/miniscript/decode.rs

@@ -386,7 +386,7 @@ pub fn parse(tokens: &mut TokenIter) -> Result<Miniscript<bitcoin::PublicKey>, E
                 let a = term.pop().unwrap();
                 let b = term.pop().unwrap();
                 let c = term.pop().unwrap();
-                let wrapped_ms = Terminal::AndOr(Arc::new(a), Arc::new(b), Arc::new(c));
+                let wrapped_ms = Terminal::AndOr(Arc::new(a), Arc::new(c), Arc::new(b));
 
                 let ty = Type::type_check(&wrapped_ms, return_none)?;
                 let ext = ExtData::type_check(&wrapped_ms, return_none)?;

src/miniscript/mod.rs

@@ -569,6 +569,10 @@ mod tests {
             "Script(OP_PUSHNUM_1 OP_VERIFY OP_PUSHNUM_1)",
         );
         roundtrip(&ms_str!("0"), "Script(OP_0)");
+        roundtrip(
+            &ms_str!("andor(0,1,0)"),
+            "Script(OP_0 OP_NOTIF OP_0 OP_ELSE OP_PUSHNUM_1 OP_ENDIF)",
+        );
 
         assert!(Miniscript::<bitcoin::PublicKey>::from_str("1()").is_err());
         assert!(Miniscript::<bitcoin::PublicKey>::from_str("tv:1()").is_err());