Skip to content

Commit b71f55f

Browse files
tchardingtcharding
committed
Rename Liftable to Lift
In Rust, by convention, traits with a single method are named the same as the method. `Liftable` should be called `Lift`, make it so.
1 parent f8717e4 commit b71f55f

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎examples/htlc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::str::FromStr;
77

88
use miniscript::bitcoin::Network;
99
use miniscript::descriptor::Wsh;
10-
use miniscript::policy::{Concrete, Liftable};
10+
use miniscript::policy::{Concrete, Lift};
1111

1212
fn main() {
1313
// HTLC policy with 10:1 odds for happy (co-operative) case compared to uncooperative case.

‎fuzz/fuzz_targets/compile_descriptor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::str::FromStr;
22

33
use honggfuzz::fuzz;
44
use miniscript::{policy, Miniscript, Segwitv0};
5-
use policy::Liftable;
5+
use policy::Lift;
66

77
type Script = Miniscript<String, Segwitv0>;
88
type Policy = policy::Concrete<String>;

‎src/descriptor/bare.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::expression::{self, FromTree};
1818
use crate::miniscript::context::{ScriptContext, ScriptContextError};
1919
use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};
2020
use crate::plan::AssetProvider;
21-
use crate::policy::{semantic, Liftable};
21+
use crate::policy::{semantic, Lift};
2222
use crate::prelude::*;
2323
use crate::util::{varint_len, witness_to_scriptsig};
2424
use crate::{
@@ -164,7 +164,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Bare<Pk> {
164164
}
165165
}
166166

167-
impl<Pk: MiniscriptKey> Liftable<Pk> for Bare<Pk> {
167+
impl<Pk: MiniscriptKey> Lift<Pk> for Bare<Pk> {
168168
fn lift(&self) -> Result<semantic::Policy<Pk>, Error> { self.ms.lift() }
169169
}
170170

@@ -361,7 +361,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Pkh<Pk> {
361361
}
362362
}
363363

364-
impl<Pk: MiniscriptKey> Liftable<Pk> for Pkh<Pk> {
364+
impl<Pk: MiniscriptKey> Lift<Pk> for Pkh<Pk> {
365365
fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
366366
Ok(semantic::Policy::Key(self.pk.clone()))
367367
}

‎src/descriptor/segwitv0.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::expression::{self, FromTree};
1616
use crate::miniscript::context::{ScriptContext, ScriptContextError};
1717
use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};
1818
use crate::plan::AssetProvider;
19-
use crate::policy::{semantic, Liftable};
19+
use crate::policy::{semantic, Lift};
2020
use crate::prelude::*;
2121
use crate::util::varint_len;
2222
use crate::{
@@ -219,7 +219,7 @@ pub enum WshInner<Pk: MiniscriptKey> {
219219
Ms(Miniscript<Pk, Segwitv0>),
220220
}
221221

222-
impl<Pk: MiniscriptKey> Liftable<Pk> for Wsh<Pk> {
222+
impl<Pk: MiniscriptKey> Lift<Pk> for Wsh<Pk> {
223223
fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
224224
match self.inner {
225225
WshInner::SortedMulti(ref smv) => smv.lift(),
@@ -468,7 +468,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Wpkh<Pk> {
468468
}
469469
}
470470

471-
impl<Pk: MiniscriptKey> Liftable<Pk> for Wpkh<Pk> {
471+
impl<Pk: MiniscriptKey> Lift<Pk> for Wpkh<Pk> {
472472
fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
473473
Ok(semantic::Policy::Key(self.pk.clone()))
474474
}

‎src/descriptor/sh.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::expression::{self, FromTree};
2020
use crate::miniscript::context::ScriptContext;
2121
use crate::miniscript::satisfy::{Placeholder, Satisfaction};
2222
use crate::plan::AssetProvider;
23-
use crate::policy::{semantic, Liftable};
23+
use crate::policy::{semantic, Lift};
2424
use crate::prelude::*;
2525
use crate::util::{varint_len, witness_to_scriptsig};
2626
use crate::{
@@ -48,7 +48,7 @@ pub enum ShInner<Pk: MiniscriptKey> {
4848
Ms(Miniscript<Pk, Legacy>),
4949
}
5050

51-
impl<Pk: MiniscriptKey> Liftable<Pk> for Sh<Pk> {
51+
impl<Pk: MiniscriptKey> Lift<Pk> for Sh<Pk> {
5252
fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
5353
match self.inner {
5454
ShInner::Wsh(ref wsh) => wsh.lift(),

‎src/descriptor/sortedmulti.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
195195
pub fn max_satisfaction_size(&self) -> usize { 1 + 73 * self.k }
196196
}
197197

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> {
199199
fn lift(&self) -> Result<policy::semantic::Policy<Pk>, Error> {
200200
let ret = policy::semantic::Policy::Threshold(
201201
self.k,

‎src/descriptor/tr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::miniscript::satisfy::{Placeholder, Satisfaction, SchnorrSigType, Witn
1717
use crate::miniscript::Miniscript;
1818
use crate::plan::AssetProvider;
1919
use crate::policy::semantic::Policy;
20-
use crate::policy::Liftable;
20+
use crate::policy::Lift;
2121
use crate::prelude::*;
2222
use crate::util::{varint_len, witness_size};
2323
use crate::{
@@ -616,7 +616,7 @@ fn split_once(inp: &str, delim: char) -> Option<(&str, &str)> {
616616
}
617617
}
618618

619-
impl<Pk: MiniscriptKey> Liftable<Pk> for TapTree<Pk> {
619+
impl<Pk: MiniscriptKey> Lift<Pk> for TapTree<Pk> {
620620
fn lift(&self) -> Result<Policy<Pk>, Error> {
621621
fn lift_helper<Pk: MiniscriptKey>(s: &TapTree<Pk>) -> Result<Policy<Pk>, Error> {
622622
match *s {
@@ -632,7 +632,7 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for TapTree<Pk> {
632632
}
633633
}
634634

635-
impl<Pk: MiniscriptKey> Liftable<Pk> for Tr<Pk> {
635+
impl<Pk: MiniscriptKey> Lift<Pk> for Tr<Pk> {
636636
fn lift(&self) -> Result<Policy<Pk>, Error> {
637637
match &self.tree {
638638
Some(root) => {

‎src/miniscript/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ mod tests {
609609
use super::{Miniscript, ScriptContext, Segwitv0, Tap};
610610
use crate::miniscript::types::{self, ExtData, Property, Type};
611611
use crate::miniscript::Terminal;
612-
use crate::policy::Liftable;
612+
use crate::policy::Lift;
613613
use crate::prelude::*;
614614
use crate::test_utils::{StrKeyTranslator, StrXOnlyKeyTranslator};
615615
use crate::{hex_script, ExtParams, Satisfier, ToPublicKey, TranslatePk};

‎src/policy/compiler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ mod tests {
11561156

11571157
use super::*;
11581158
use crate::miniscript::{Legacy, Segwitv0, Tap};
1159-
use crate::policy::Liftable;
1159+
use crate::policy::Lift;
11601160
use crate::{script_num_size, ToPublicKey};
11611161

11621162
type SPolicy = Concrete<String>;

‎src/policy/concrete.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use {
1414
crate::miniscript::ScriptContext,
1515
crate::policy::compiler::CompilerError,
1616
crate::policy::compiler::OrdF64,
17-
crate::policy::{compiler, Concrete, Liftable, Semantic},
17+
crate::policy::{compiler, Concrete, Lift, Semantic},
1818
crate::Descriptor,
1919
crate::Miniscript,
2020
crate::Tap,

‎src/policy/mod.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const ENTAILMENT_MAX_TERMINALS: usize = 20;
4444
/// exceed resource limits for any compilation but cannot detect such policies
4545
/// while lifting. Note that our compiler would not succeed for any such
4646
/// policies.
47-
pub trait Liftable<Pk: MiniscriptKey> {
47+
pub trait Lift<Pk: MiniscriptKey> {
4848
/// Converts this object into an abstract policy.
4949
fn lift(&self) -> Result<Semantic<Pk>, Error>;
5050
}
@@ -104,7 +104,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
104104
}
105105
}
106106

107-
impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Miniscript<Pk, Ctx> {
107+
impl<Pk: MiniscriptKey, Ctx: ScriptContext> Lift<Pk> for Miniscript<Pk, Ctx> {
108108
fn lift(&self) -> Result<Semantic<Pk>, Error> {
109109
// check whether the root miniscript can have a spending path that is
110110
// a combination of heightlock and timelock
@@ -113,7 +113,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Miniscript<Pk, Ctx>
113113
}
114114
}
115115

116-
impl<Pk: MiniscriptKey, Ctx: ScriptContext> Liftable<Pk> for Terminal<Pk, Ctx> {
116+
impl<Pk: MiniscriptKey, Ctx: ScriptContext> Lift<Pk> for Terminal<Pk, Ctx> {
117117
fn lift(&self) -> Result<Semantic<Pk>, Error> {
118118
let ret = match *self {
119119
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> {
164164
}
165165
}
166166

167-
impl<Pk: MiniscriptKey> Liftable<Pk> for Descriptor<Pk> {
167+
impl<Pk: MiniscriptKey> Lift<Pk> for Descriptor<Pk> {
168168
fn lift(&self) -> Result<Semantic<Pk>, Error> {
169169
match *self {
170170
Descriptor::Bare(ref bare) => bare.lift(),
@@ -177,11 +177,11 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for Descriptor<Pk> {
177177
}
178178
}
179179

180-
impl<Pk: MiniscriptKey> Liftable<Pk> for Semantic<Pk> {
180+
impl<Pk: MiniscriptKey> Lift<Pk> for Semantic<Pk> {
181181
fn lift(&self) -> Result<Semantic<Pk>, Error> { Ok(self.clone()) }
182182
}
183183

184-
impl<Pk: MiniscriptKey> Liftable<Pk> for Concrete<Pk> {
184+
impl<Pk: MiniscriptKey> Lift<Pk> for Concrete<Pk> {
185185
fn lift(&self) -> Result<Semantic<Pk>, Error> {
186186
// do not lift if there is a possible satisfaction
187187
// involving combination of timelocks and heightlocks
@@ -197,7 +197,7 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for Concrete<Pk> {
197197
Concrete::Ripemd160(ref h) => Semantic::Ripemd160(h.clone()),
198198
Concrete::Hash160(ref h) => Semantic::Hash160(h.clone()),
199199
Concrete::And(ref subs) => {
200-
let semantic_subs: Result<_, Error> = subs.iter().map(Liftable::lift).collect();
200+
let semantic_subs: Result<_, Error> = subs.iter().map(Lift::lift).collect();
201201
Semantic::Threshold(2, semantic_subs?)
202202
}
203203
Concrete::Or(ref subs) => {
@@ -206,15 +206,15 @@ impl<Pk: MiniscriptKey> Liftable<Pk> for Concrete<Pk> {
206206
Semantic::Threshold(1, semantic_subs?)
207207
}
208208
Concrete::Threshold(k, ref subs) => {
209-
let semantic_subs: Result<_, Error> = subs.iter().map(Liftable::lift).collect();
209+
let semantic_subs: Result<_, Error> = subs.iter().map(Lift::lift).collect();
210210
Semantic::Threshold(k, semantic_subs?)
211211
}
212212
}
213213
.normalized();
214214
Ok(ret)
215215
}
216216
}
217-
impl<Pk: MiniscriptKey> Liftable<Pk> for Arc<Concrete<Pk>> {
217+
impl<Pk: MiniscriptKey> Lift<Pk> for Arc<Concrete<Pk>> {
218218
fn lift(&self) -> Result<Semantic<Pk>, Error> { self.as_ref().lift() }
219219
}
220220

@@ -228,7 +228,7 @@ mod tests {
228228

229229
use super::super::miniscript::context::Segwitv0;
230230
use super::super::miniscript::Miniscript;
231-
use super::{Concrete, Liftable, Semantic};
231+
use super::{Concrete, Lift, Semantic};
232232
#[cfg(feature = "compiler")]
233233
use crate::descriptor::Tr;
234234
use crate::prelude::*;

0 commit comments

Comments
 (0)