witness script -> explicit script

sanket1729 · sanket1729 · commit f8a9478349ad · 2020-12-31T08:32:14.000-08:00
diff --git a/examples/htlc.rs b/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"
     );
 
diff --git a/examples/parse.rs b/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"
     );
 }
diff --git a/examples/sign_multisig.rs b/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\
diff --git a/src/descriptor/bare.rs b/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>,
     {
diff --git a/src/descriptor/mod.rs b/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();
diff --git a/src/descriptor/segwitv0.rs b/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>,
     {
diff --git a/src/descriptor/sh.rs b/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),

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ fn main() {`
`42`	`42`	`);`
`43`	`43`
`44`	`44`	`assert_eq!(`
`45`		`- format!("{:x}", my_descriptor.witness_script(NullCtx)),`
	`45`	`+ format!("{:x}", my_descriptor.explicit_script(NullCtx)),`
`46`	`46`	`"21020202020202020202020202020202020202020202020202020202020202020202ac"`
`47`	`47`	`);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ where`
`136`	`136`	`Script::new()`
`137`	`137`	`}`
`138`	`138`
`139`		`- fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
	`139`	`+ fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
`140`	`140`	`where`
`141`	`141`	`Pk: ToPublicKey<ToPkCtx>,`
`142`	`142`	`{`
`@@ -306,7 +306,7 @@ where`
`306`	`306`	`Script::new()`
`307`	`307`	`}`
`308`	`308`
`309`		`- fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
	`309`	`+ fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
`310`	`310`	`where`
`311`	`311`	`Pk: ToPublicKey<ToPkCtx>,`
`312`	`312`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ where`
`174`	`174`	`where`
`175`	`175`	`Pk: ToPublicKey<ToPkCtx>,`
`176`	`176`	`{`
`177`		`- self.witness_script(to_pk_ctx).to_v0_p2wsh()`
	`177`	`+ self.explicit_script(to_pk_ctx).to_v0_p2wsh()`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`fn unsigned_script_sig<ToPkCtx: Copy>(&self, _to_pk_ctx: ToPkCtx) -> Script`
`@@ -184,7 +184,7 @@ where`
`184`	`184`	`Script::new()`
`185`	`185`	`}`
`186`	`186`
`187`		`- fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
	`187`	`+ fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
`188`	`188`	`where`
`189`	`189`	`Pk: ToPublicKey<ToPkCtx>,`
`190`	`190`	`{`
`@@ -208,7 +208,7 @@ where`
`208`	`208`	`WshInner::SortedMulti(ref smv) => smv.satisfy(satisfier, to_pk_ctx)?,`
`209`	`209`	`WshInner::Ms(ref ms) => ms.satisfy(satisfier, to_pk_ctx)?,`
`210`	`210`	`};`
`211`		`- witness.push(self.witness_script(to_pk_ctx).into_bytes());`
	`211`	`+ witness.push(self.explicit_script(to_pk_ctx).into_bytes());`
`212`	`212`	`let script_sig = Script::new();`
`213`	`213`	`Ok((witness, script_sig))`
`214`	`214`	`}`
`@@ -239,7 +239,7 @@ where`
`239`	`239`	`where`
`240`	`240`	`Pk: ToPublicKey<ToPkCtx>,`
`241`	`241`	`{`
`242`		`- self.witness_script(to_pk_ctx)`
	`242`	`+ self.explicit_script(to_pk_ctx)`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
`@@ -387,7 +387,7 @@ where`
`387`	`387`	`Script::new()`
`388`	`388`	`}`
`389`	`389`
`390`		`- fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
	`390`	`+ fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
`391`	`391`	`where`
`392`	`392`	`Pk: ToPublicKey<ToPkCtx>,`
`393`	`393`	`{`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ where`
`238`	`238`	`{`
`239`	`239`	`match self.inner {`
`240`	`240`	`ShInner::Wsh(ref wsh) => {`
`241`		`- let witness_script = wsh.witness_script(to_pk_ctx);`
	`241`	`+ let witness_script = wsh.explicit_script(to_pk_ctx);`
`242`	`242`	`script::Builder::new()`
`243`	`243`	`.push_slice(&witness_script.to_v0_p2wsh()[..])`
`244`	`244`	`.into_script()`
`@@ -253,12 +253,12 @@ where`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
`256`		`- fn witness_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
	`256`	`+ fn explicit_script<ToPkCtx: Copy>(&self, to_pk_ctx: ToPkCtx) -> Script`
`257`	`257`	`where`
`258`	`258`	`Pk: ToPublicKey<ToPkCtx>,`
`259`	`259`	`{`
`260`	`260`	`match self.inner {`
`261`		`- ShInner::Wsh(ref wsh) => wsh.witness_script(to_pk_ctx),`
	`261`	`+ ShInner::Wsh(ref wsh) => wsh.explicit_script(to_pk_ctx),`
`262`	`262`	`ShInner::Wpkh(ref wpkh) => wpkh.script_pubkey(to_pk_ctx),`
`263`	`263`	`ShInner::SortedMulti(ref smv) => smv.encode(to_pk_ctx),`
`264`	`264`	`ShInner::Ms(ref ms) => ms.encode(to_pk_ctx),`