Skip to content

Commit c1af456

Browse files
committed
Merge #475: Fix typo in check_miniscript method declaration and use
b9fc061 Fix typo in check_miniscript method declaration and use (thunderbiscuit) Pull request description: ### Description This PR renames the `check_minsicript()` method on the `CheckMiniscript` trait and its uses throughout the codebase to `check_miniscript()`. ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing ACKs for top commit: notmandatory: ACK b9fc061 Tree-SHA512: cc4406c653cb86f9b15e60c6f87b95c300784d6b2992abc98b3f2db4b02ce252304cc0ab2c638f080b0caf3889e832885eca19e2d6582a3557c8709311b69644
2 parents d20b649 + b9fc061 commit c1af456

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/descriptor/dsl.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ macro_rules! impl_leaf_opcode {
8484
)
8585
.map_err($crate::descriptor::DescriptorError::Miniscript)
8686
.and_then(|minisc| {
87-
minisc.check_minsicript()?;
87+
minisc.check_miniscript()?;
8888
Ok(minisc)
8989
})
9090
.map(|minisc| {
@@ -108,7 +108,7 @@ macro_rules! impl_leaf_opcode_value {
108108
)
109109
.map_err($crate::descriptor::DescriptorError::Miniscript)
110110
.and_then(|minisc| {
111-
minisc.check_minsicript()?;
111+
minisc.check_miniscript()?;
112112
Ok(minisc)
113113
})
114114
.map(|minisc| {
@@ -132,7 +132,7 @@ macro_rules! impl_leaf_opcode_value_two {
132132
)
133133
.map_err($crate::descriptor::DescriptorError::Miniscript)
134134
.and_then(|minisc| {
135-
minisc.check_minsicript()?;
135+
minisc.check_miniscript()?;
136136
Ok(minisc)
137137
})
138138
.map(|minisc| {
@@ -165,7 +165,7 @@ macro_rules! impl_node_opcode_two {
165165
std::sync::Arc::new(b_minisc),
166166
))?;
167167

168-
minisc.check_minsicript()?;
168+
minisc.check_miniscript()?;
169169

170170
Ok((minisc, a_keymap, $crate::keys::merge_networks(&a_networks, &b_networks)))
171171
})
@@ -197,7 +197,7 @@ macro_rules! impl_node_opcode_three {
197197
std::sync::Arc::new(c_minisc),
198198
))?;
199199

200-
minisc.check_minsicript()?;
200+
minisc.check_miniscript()?;
201201

202202
Ok((minisc, a_keymap, networks))
203203
})
@@ -243,7 +243,7 @@ macro_rules! apply_modifier {
243243
),
244244
)?;
245245

246-
minisc.check_minsicript()?;
246+
minisc.check_miniscript()?;
247247

248248
Ok((minisc, keymap, networks))
249249
})

src/descriptor/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,13 @@ pub(crate) fn into_wallet_descriptor_checked<T: IntoWalletDescriptor>(
238238
#[doc(hidden)]
239239
/// Used internally mainly by the `descriptor!()` and `fragment!()` macros
240240
pub trait CheckMiniscript<Ctx: miniscript::ScriptContext> {
241-
fn check_minsicript(&self) -> Result<(), miniscript::Error>;
241+
fn check_miniscript(&self) -> Result<(), miniscript::Error>;
242242
}
243243

244244
impl<Ctx: miniscript::ScriptContext, Pk: miniscript::MiniscriptKey> CheckMiniscript<Ctx>
245245
for miniscript::Miniscript<Pk, Ctx>
246246
{
247-
fn check_minsicript(&self) -> Result<(), miniscript::Error> {
247+
fn check_miniscript(&self) -> Result<(), miniscript::Error> {
248248
Ctx::check_global_validity(self)?;
249249

250250
Ok(())

src/keys/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ pub fn make_pk<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
748748
let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?;
749749
let minisc = Miniscript::from_ast(Terminal::PkK(key))?;
750750

751-
minisc.check_minsicript()?;
751+
minisc.check_miniscript()?;
752752

753753
Ok((minisc, key_map, valid_networks))
754754
}
@@ -762,7 +762,7 @@ pub fn make_pkh<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
762762
let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?;
763763
let minisc = Miniscript::from_ast(Terminal::PkH(key))?;
764764

765-
minisc.check_minsicript()?;
765+
minisc.check_miniscript()?;
766766

767767
Ok((minisc, key_map, valid_networks))
768768
}
@@ -777,7 +777,7 @@ pub fn make_multi<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
777777
let (pks, key_map, valid_networks) = expand_multi_keys(pks, secp)?;
778778
let minisc = Miniscript::from_ast(Terminal::Multi(thresh, pks))?;
779779

780-
minisc.check_minsicript()?;
780+
minisc.check_miniscript()?;
781781

782782
Ok((minisc, key_map, valid_networks))
783783
}

0 commit comments

Comments
 (0)