Rename Liftable to Lift

tcharding · tcharding · commit b71f55f959cb · 2023-10-03T13:10:42.000+11:00
In Rust, by convention, traits with a single method are named the same
as the method. `Liftable` should be called `Lift`, make it so.
diff --git a/examples/htlc.rs b/examples/htlc.rs
@@ -7,7 +7,7 @@ use std::str::FromStr;
 
 use miniscript::bitcoin::Network;
 use miniscript::descriptor::Wsh;
-use miniscript::policy::{Concrete, Liftable};
+use miniscript::policy::{Concrete, Lift};
 
 fn main() {
     // HTLC policy with 10:1 odds for happy (co-operative) case compared to uncooperative case.
diff --git a/fuzz/fuzz_targets/compile_descriptor.rs b/fuzz/fuzz_targets/compile_descriptor.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use honggfuzz::fuzz;
 use miniscript::{policy, Miniscript, Segwitv0};
-use policy::Liftable;
+use policy::Lift;
 
 type Script = Miniscript<String, Segwitv0>;
 type Policy = policy::Concrete<String>;
diff --git a/src/descriptor/bare.rs b/src/descriptor/bare.rs
@@ -18,7 +18,7 @@ use crate::expression::{self, FromTree};
 use crate::miniscript::context::{ScriptContext, ScriptContextError};
 use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};
 use crate::plan::AssetProvider;
-use crate::policy::{semantic, Liftable};
+use crate::policy::{semantic, Lift};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
@@ -164,7 +164,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Bare<Pk> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Bare<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Bare<Pk> {
     fn lift(&self) -> Result<semantic::Policy<Pk>, Error> { self.ms.lift() }
 }
 
@@ -361,7 +361,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Pkh<Pk> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Pkh<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Pkh<Pk> {
     fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
         Ok(semantic::Policy::Key(self.pk.clone()))
     }
diff --git a/src/descriptor/segwitv0.rs b/src/descriptor/segwitv0.rs
@@ -16,7 +16,7 @@ use crate::expression::{self, FromTree};
 use crate::miniscript::context::{ScriptContext, ScriptContextError};
 use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};
 use crate::plan::AssetProvider;
-use crate::policy::{semantic, Liftable};
+use crate::policy::{semantic, Lift};
 use crate::prelude::*;
 use crate::util::varint_len;
 use crate::{
@@ -219,7 +219,7 @@ pub enum WshInner<Pk: MiniscriptKey> {
     Ms(Miniscript<Pk, Segwitv0>),
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Wsh<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Wsh<Pk> {
     fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
         match self.inner {
             WshInner::SortedMulti(ref smv) => smv.lift(),
@@ -468,7 +468,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Wpkh<Pk> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Wpkh<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Wpkh<Pk> {
     fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
         Ok(semantic::Policy::Key(self.pk.clone()))
     }
diff --git a/src/descriptor/sh.rs b/src/descriptor/sh.rs
@@ -20,7 +20,7 @@ use crate::expression::{self, FromTree};
 use crate::miniscript::context::ScriptContext;
 use crate::miniscript::satisfy::{Placeholder, Satisfaction};
 use crate::plan::AssetProvider;
-use crate::policy::{semantic, Liftable};
+use crate::policy::{semantic, Lift};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
@@ -48,7 +48,7 @@ pub enum ShInner<Pk: MiniscriptKey> {
     Ms(Miniscript<Pk, Legacy>),
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Sh<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Sh<Pk> {
     fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
         match self.inner {
             ShInner::Wsh(ref wsh) => wsh.lift(),
diff --git a/src/descriptor/sortedmulti.rs b/src/descriptor/sortedmulti.rs
@@ -195,7 +195,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
     pub fn max_satisfaction_size(&self) -> usize { 1 + 73 * self.k }
 }
 
-impl<Pk: MiniscriptKey, Ctx: ScriptContext> policy::Liftable<Pk> for SortedMultiVec<Pk, Ctx> {
+impl<Pk: MiniscriptKey, Ctx: ScriptContext> policy::Lift<Pk> for SortedMultiVec<Pk, Ctx> {
     fn lift(&self) -> Result<policy::semantic::Policy<Pk>, Error> {
         let ret = policy::semantic::Policy::Threshold(
             self.k,
diff --git a/src/descriptor/tr.rs b/src/descriptor/tr.rs
@@ -17,7 +17,7 @@ use crate::miniscript::satisfy::{Placeholder, Satisfaction, SchnorrSigType, Witn
 use crate::miniscript::Miniscript;
 use crate::plan::AssetProvider;
 use crate::policy::semantic::Policy;
-use crate::policy::Liftable;
+use crate::policy::Lift;
 use crate::prelude::*;
 use crate::util::{varint_len, witness_size};
 use crate::{
@@ -616,7 +616,7 @@ fn split_once(inp: &str, delim: char) -> Option<(&str, &str)> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for TapTree<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for TapTree<Pk> {
     fn lift(&self) -> Result<Policy<Pk>, Error> {
         fn lift_helper<Pk: MiniscriptKey>(s: &TapTree<Pk>) -> Result<Policy<Pk>, Error> {
             match *s {
@@ -632,7 +632,7 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for TapTree<Pk> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Tr<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Tr<Pk> {
     fn lift(&self) -> Result<Policy<Pk>, Error> {
         match &self.tree {
             Some(root) => {
diff --git a/src/miniscript/mod.rs b/src/miniscript/mod.rs
@@ -609,7 +609,7 @@ mod tests {
     use super::{Miniscript, ScriptContext, Segwitv0, Tap};
     use crate::miniscript::types::{self, ExtData, Property, Type};
     use crate::miniscript::Terminal;
-    use crate::policy::Liftable;
+    use crate::policy::Lift;
     use crate::prelude::*;
     use crate::test_utils::{StrKeyTranslator, StrXOnlyKeyTranslator};
     use crate::{hex_script, ExtParams, Satisfier, ToPublicKey, TranslatePk};
diff --git a/src/policy/compiler.rs b/src/policy/compiler.rs
@@ -1156,7 +1156,7 @@ mod tests {
 
     use super::*;
     use crate::miniscript::{Legacy, Segwitv0, Tap};
-    use crate::policy::Liftable;
+    use crate::policy::Lift;
     use crate::{script_num_size, ToPublicKey};
 
     type SPolicy = Concrete<String>;
diff --git a/src/policy/concrete.rs b/src/policy/concrete.rs
@@ -14,7 +14,7 @@ use {
     crate::miniscript::ScriptContext,
     crate::policy::compiler::CompilerError,
     crate::policy::compiler::OrdF64,
-    crate::policy::{compiler, Concrete, Liftable, Semantic},
+    crate::policy::{compiler, Concrete, Lift, Semantic},
     crate::Descriptor,
     crate::Miniscript,
     crate::Tap,
diff --git a/src/policy/mod.rs b/src/policy/mod.rs
@@ -44,7 +44,7 @@ const ENTAILMENT_MAX_TERMINALS: usize = 20;
 /// exceed resource limits for any compilation but cannot detect such policies
 /// while lifting. Note that our compiler would not succeed for any such
 /// policies.
-pub trait Liftable<Pk: MiniscriptKey> {
+pub trait Lift<Pk: MiniscriptKey> {
     /// Converts this object into an abstract policy.
     fn lift(&self) -> Result<Semantic<Pk>, Error>;
 }
@@ -104,7 +104,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
     }
 }
 
-impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Miniscript<Pk, Ctx> {
+impl<Pk: MiniscriptKey, Ctx: ScriptContext> Lift<Pk> for Miniscript<Pk, Ctx> {
     fn lift(&self) -> Result<Semantic<Pk>, Error> {
         // check whether the root miniscript can have a spending path that is
         // a combination of heightlock and timelock
@@ -113,7 +113,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Miniscript<Pk, Ctx>
     }
 }
 
-impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Terminal<Pk, Ctx> {
+impl<Pk: MiniscriptKey, Ctx: ScriptContext> Lift<Pk> for Terminal<Pk, Ctx> {
     fn lift(&self) -> Result<Semantic<Pk>, Error> {
         let ret = match *self {
             Terminal::PkK(ref pk) | Terminal::PkH(ref pk) => Semantic::Key(pk.clone()),
@@ -164,7 +164,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Terminal<Pk, Ctx> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Descriptor<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Descriptor<Pk> {
     fn lift(&self) -> Result<Semantic<Pk>, Error> {
         match *self {
             Descriptor::Bare(ref bare) => bare.lift(),
@@ -177,11 +177,11 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for Descriptor<Pk> {
     }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Semantic<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Semantic<Pk> {
     fn lift(&self) -> Result<Semantic<Pk>, Error> { Ok(self.clone()) }
 }
 
-impl<Pk: MiniscriptKey> Liftable<Pk> for Concrete<Pk> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Concrete<Pk> {
     fn lift(&self) -> Result<Semantic<Pk>, Error> {
         // do not lift if there is a possible satisfaction
         // involving combination of timelocks and heightlocks
@@ -197,7 +197,7 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for Concrete<Pk> {
             Concrete::Ripemd160(ref h) => Semantic::Ripemd160(h.clone()),
             Concrete::Hash160(ref h) => Semantic::Hash160(h.clone()),
             Concrete::And(ref subs) => {
-                let semantic_subs: Result<_, Error> = subs.iter().map(Liftable::lift).collect();
+                let semantic_subs: Result<_, Error> = subs.iter().map(Lift::lift).collect();
                 Semantic::Threshold(2, semantic_subs?)
             }
             Concrete::Or(ref subs) => {
@@ -206,15 +206,15 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for Concrete<Pk> {
                 Semantic::Threshold(1, semantic_subs?)
             }
             Concrete::Threshold(k, ref subs) => {
-                let semantic_subs: Result<_, Error> = subs.iter().map(Liftable::lift).collect();
+                let semantic_subs: Result<_, Error> = subs.iter().map(Lift::lift).collect();
                 Semantic::Threshold(k, semantic_subs?)
             }
         }
         .normalized();
         Ok(ret)
     }
 }
-impl<Pk: MiniscriptKey> Liftable<Pk> for Arc<Concrete<Pk>> {
+impl<Pk: MiniscriptKey> Lift<Pk> for Arc<Concrete<Pk>> {
     fn lift(&self) -> Result<Semantic<Pk>, Error> { self.as_ref().lift() }
 }
 
@@ -228,7 +228,7 @@ mod tests {
 
     use super::super::miniscript::context::Segwitv0;
     use super::super::miniscript::Miniscript;
-    use super::{Concrete, Liftable, Semantic};
+    use super::{Concrete, Lift, Semantic};
     #[cfg(feature = "compiler")]
     use crate::descriptor::Tr;
     use crate::prelude::*;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ use crate::expression::{self, FromTree};`
`18`	`18`	`use crate::miniscript::context::{ScriptContext, ScriptContextError};`
`19`	`19`	`use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};`
`20`	`20`	`use crate::plan::AssetProvider;`
`21`		`-use crate::policy::{semantic, Liftable};`
	`21`	`+use crate::policy::{semantic, Lift};`
`22`	`22`	`use crate::prelude::*;`
`23`	`23`	`use crate::util::{varint_len, witness_to_scriptsig};`
`24`	`24`	`use crate::{`
`@@ -164,7 +164,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Bare<Pk> {`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`		`-impl<Pk: MiniscriptKey> Liftable<Pk> for Bare<Pk> {`
	`167`	`+impl<Pk: MiniscriptKey> Lift<Pk> for Bare<Pk> {`
`168`	`168`	`fn lift(&self) -> Result<semantic::Policy<Pk>, Error> { self.ms.lift() }`
`169`	`169`	`}`
`170`	`170`
`@@ -361,7 +361,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Pkh<Pk> {`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`-impl<Pk: MiniscriptKey> Liftable<Pk> for Pkh<Pk> {`
	`364`	`+impl<Pk: MiniscriptKey> Lift<Pk> for Pkh<Pk> {`
`365`	`365`	`fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {`
`366`	`366`	`Ok(semantic::Policy::Key(self.pk.clone()))`
`367`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ use crate::expression::{self, FromTree};`
`16`	`16`	`use crate::miniscript::context::{ScriptContext, ScriptContextError};`
`17`	`17`	`use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};`
`18`	`18`	`use crate::plan::AssetProvider;`
`19`		`-use crate::policy::{semantic, Liftable};`
	`19`	`+use crate::policy::{semantic, Lift};`
`20`	`20`	`use crate::prelude::*;`
`21`	`21`	`use crate::util::varint_len;`
`22`	`22`	`use crate::{`
`@@ -219,7 +219,7 @@ pub enum WshInner<Pk: MiniscriptKey> {`
`219`	`219`	`Ms(Miniscript<Pk, Segwitv0>),`
`220`	`220`	`}`
`221`	`221`
`222`		`-impl<Pk: MiniscriptKey> Liftable<Pk> for Wsh<Pk> {`
	`222`	`+impl<Pk: MiniscriptKey> Lift<Pk> for Wsh<Pk> {`
`223`	`223`	`fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {`
`224`	`224`	`match self.inner {`
`225`	`225`	`WshInner::SortedMulti(ref smv) => smv.lift(),`
`@@ -468,7 +468,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Wpkh<Pk> {`
`468`	`468`	`}`
`469`	`469`	`}`
`470`	`470`
`471`		`-impl<Pk: MiniscriptKey> Liftable<Pk> for Wpkh<Pk> {`
	`471`	`+impl<Pk: MiniscriptKey> Lift<Pk> for Wpkh<Pk> {`
`472`	`472`	`fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {`
`473`	`473`	`Ok(semantic::Policy::Key(self.pk.clone()))`
`474`	`474`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {`
`195`	`195`	`pub fn max_satisfaction_size(&self) -> usize { 1 + 73 * self.k }`
`196`	`196`	`}`
`197`	`197`
`198`		`-impl<Pk: MiniscriptKey, Ctx: ScriptContext> policy::Liftable<Pk> for SortedMultiVec<Pk, Ctx> {`
	`198`	`+impl<Pk: MiniscriptKey, Ctx: ScriptContext> policy::Lift<Pk> for SortedMultiVec<Pk, Ctx> {`
`199`	`199`	`fn lift(&self) -> Result<policy::semantic::Policy<Pk>, Error> {`
`200`	`200`	`let ret = policy::semantic::Policy::Threshold(`
`201`	`201`	`self.k,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ use crate::miniscript::satisfy::{Placeholder, Satisfaction, SchnorrSigType, Witn`
`17`	`17`	`use crate::miniscript::Miniscript;`
`18`	`18`	`use crate::plan::AssetProvider;`
`19`	`19`	`use crate::policy::semantic::Policy;`
`20`		`-use crate::policy::Liftable;`
	`20`	`+use crate::policy::Lift;`
`21`	`21`	`use crate::prelude::*;`
`22`	`22`	`use crate::util::{varint_len, witness_size};`
`23`	`23`	`use crate::{`
`@@ -616,7 +616,7 @@ fn split_once(inp: &str, delim: char) -> Option<(&str, &str)> {`
`616`	`616`	`}`
`617`	`617`	`}`
`618`	`618`
`619`		`-impl<Pk: MiniscriptKey> Liftable<Pk> for TapTree<Pk> {`
	`619`	`+impl<Pk: MiniscriptKey> Lift<Pk> for TapTree<Pk> {`
`620`	`620`	`fn lift(&self) -> Result<Policy<Pk>, Error> {`
`621`	`621`	`fn lift_helper<Pk: MiniscriptKey>(s: &TapTree<Pk>) -> Result<Policy<Pk>, Error> {`
`622`	`622`	`match *s {`
`@@ -632,7 +632,7 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for TapTree<Pk> {`
`632`	`632`	`}`
`633`	`633`	`}`
`634`	`634`
`635`		`-impl<Pk: MiniscriptKey> Liftable<Pk> for Tr<Pk> {`
	`635`	`+impl<Pk: MiniscriptKey> Lift<Pk> for Tr<Pk> {`
`636`	`636`	`fn lift(&self) -> Result<Policy<Pk>, Error> {`
`637`	`637`	`match &self.tree {`
`638`	`638`	`Some(root) => {`