witness script -> explicit script

Author: sanket1729

examples/htlc.rs

@@ -60,7 +60,7 @@ fn main() {
     );
 
     assert_eq!(
-        format!("{:x}", htlc_descriptor.witness_script(NullCtx)),
+        format!("{:x}", htlc_descriptor.explicit_script(NullCtx)),
         "21022222222222222222222222222222222222222222222222222222222222222222ac6476a91451814f108670aced2d77c1805ddd6634bc9d473188ad025c11b26782012088a82011111111111111111111111111111111111111111111111111111111111111118768"
     );
 

examples/parse.rs

@@ -42,7 +42,7 @@ fn main() {
     );
 
     assert_eq!(
-        format!("{:x}", my_descriptor.witness_script(NullCtx)),
+        format!("{:x}", my_descriptor.explicit_script(NullCtx)),
         "21020202020202020202020202020202020202020202020202020202020202020202ac"
     );
 }

examples/sign_multisig.rs

@@ -100,7 +100,7 @@ fn main() {
     );
 
     assert_eq!(
-        format!("{:x}", my_descriptor.witness_script(NullCtx)),
+        format!("{:x}", my_descriptor.explicit_script(NullCtx)),
         "52\
          21020202020202020202020202020202020202020202020202020202020202020202\
          21020102030405060708010203040506070801020304050607080000000000000000\

src/descriptor/bare.rs

@@ -136,7 +136,7 @@ where
         Script::new()
     }
 
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>,
     {
@@ -306,7 +306,7 @@ where
         Script::new()
     }
 
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>,
     {

src/descriptor/mod.rs

@@ -139,7 +139,7 @@ pub trait DescriptorTrait<Pk: MiniscriptKey> {
     /// would be [NullCtx] and [descriptor.DescriptorPublicKeyCtx] if MiniscriptKey is [descriptor.DescriptorPublicKey]
     ///
     /// In general, this is defined by generic for the trait [ToPublicKey]
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>;
 
@@ -466,16 +466,16 @@ where
     /// would be [NullCtx](crate::NullCtx) and [DescriptorPublicKeyCtx] if MiniscriptKey is [DescriptorPublicKey]
     ///
     /// In general, this is defined by generic for the trait [ToPublicKey]
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>,
     {
         match *self {
-            Descriptor::Bare(ref bare) => bare.witness_script(to_pk_ctx),
-            Descriptor::Pkh(ref pkh) => pkh.witness_script(to_pk_ctx),
-            Descriptor::Wpkh(ref wpkh) => wpkh.witness_script(to_pk_ctx),
-            Descriptor::Wsh(ref wsh) => wsh.witness_script(to_pk_ctx),
-            Descriptor::Sh(ref sh) => sh.witness_script(to_pk_ctx),
+            Descriptor::Bare(ref bare) => bare.explicit_script(to_pk_ctx),
+            Descriptor::Pkh(ref pkh) => pkh.explicit_script(to_pk_ctx),
+            Descriptor::Wpkh(ref wpkh) => wpkh.explicit_script(to_pk_ctx),
+            Descriptor::Wsh(ref wsh) => wsh.explicit_script(to_pk_ctx),
+            Descriptor::Sh(ref sh) => sh.explicit_script(to_pk_ctx),
         }
     }
 
@@ -1134,7 +1134,7 @@ mod tests {
     #[test]
     fn after_is_cltv() {
         let descriptor = Descriptor::<bitcoin::PublicKey>::from_str("wsh(after(1000))").unwrap();
-        let script = descriptor.witness_script(NullCtx);
+        let script = descriptor.explicit_script(NullCtx);
 
         let actual_instructions: Vec<_> = script.instructions().collect();
         let check = actual_instructions.last().unwrap();
@@ -1145,7 +1145,7 @@ mod tests {
     #[test]
     fn older_is_csv() {
         let descriptor = Descriptor::<bitcoin::PublicKey>::from_str("wsh(older(1000))").unwrap();
-        let script = descriptor.witness_script(NullCtx);
+        let script = descriptor.explicit_script(NullCtx);
 
         let actual_instructions: Vec<_> = script.instructions().collect();
         let check = actual_instructions.last().unwrap();

src/descriptor/segwitv0.rs

@@ -174,7 +174,7 @@ where
     where
         Pk: ToPublicKey<ToPkCtx>,
     {
-        self.witness_script(to_pk_ctx).to_v0_p2wsh()
+        self.explicit_script(to_pk_ctx).to_v0_p2wsh()
     }
 
     fn unsigned_script_sig<ToPkCtx: Copy>(&self, _to_pk_ctx: ToPkCtx) -> Script
@@ -184,7 +184,7 @@ where
         Script::new()
     }
 
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>,
     {
@@ -208,7 +208,7 @@ where
             WshInner::SortedMulti(ref smv) => smv.satisfy(satisfier, to_pk_ctx)?,
             WshInner::Ms(ref ms) => ms.satisfy(satisfier, to_pk_ctx)?,
         };
-        witness.push(self.witness_script(to_pk_ctx).into_bytes());
+        witness.push(self.explicit_script(to_pk_ctx).into_bytes());
         let script_sig = Script::new();
         Ok((witness, script_sig))
     }
@@ -239,7 +239,7 @@ where
     where
         Pk: ToPublicKey<ToPkCtx>,
     {
-        self.witness_script(to_pk_ctx)
+        self.explicit_script(to_pk_ctx)
     }
 }
 
@@ -387,7 +387,7 @@ where
         Script::new()
     }
 
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>,
     {

src/descriptor/sh.rs

@@ -238,7 +238,7 @@ where
     {
         match self.inner {
             ShInner::Wsh(ref wsh) => {
-                let witness_script = wsh.witness_script(to_pk_ctx);
+                let witness_script = wsh.explicit_script(to_pk_ctx);
                 script::Builder::new()
                     .push_slice(&witness_script.to_v0_p2wsh()[..])
                     .into_script()
@@ -253,12 +253,12 @@ where
         }
     }
 
-    fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
+    fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script
     where
         Pk: ToPublicKey<ToPkCtx>,
     {
         match self.inner {
-            ShInner::Wsh(ref wsh) => wsh.witness_script(to_pk_ctx),
+            ShInner::Wsh(ref wsh) => wsh.explicit_script(to_pk_ctx),
             ShInner::Wpkh(ref wpkh) => wpkh.script_pubkey(to_pk_ctx),
             ShInner::SortedMulti(ref smv) => smv.encode(to_pk_ctx),
             ShInner::Ms(ref ms) => ms.encode(to_pk_ctx),