frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo in check_miniscript method declaration and use

Browse Source
This commit is contained in:
thunderbiscuit 2021-11-23 12:59:08 -05:00
parent afa1ab4ff8
commit b9fc06195b
No known key found for this signature in database
GPG Key ID: 88253696EB836462
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/descriptor/dsl.rs
View File

@ -84,7 +84,7 @@ macro_rules! impl_leaf_opcode {
) )
.map_err($crate::descriptor::DescriptorError::Miniscript) .map_err($crate::descriptor::DescriptorError::Miniscript)
.and_then(|minisc| { .and_then(|minisc| {
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok(minisc) Ok(minisc)
}) })
.map(|minisc| { .map(|minisc| {
@ -108,7 +108,7 @@ macro_rules! impl_leaf_opcode_value {
) )
.map_err($crate::descriptor::DescriptorError::Miniscript) .map_err($crate::descriptor::DescriptorError::Miniscript)
.and_then(|minisc| { .and_then(|minisc| {
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok(minisc) Ok(minisc)
}) })
.map(|minisc| { .map(|minisc| {
@ -132,7 +132,7 @@ macro_rules! impl_leaf_opcode_value_two {
) )
.map_err($crate::descriptor::DescriptorError::Miniscript) .map_err($crate::descriptor::DescriptorError::Miniscript)
.and_then(|minisc| { .and_then(|minisc| {
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok(minisc) Ok(minisc)
}) })
.map(|minisc| { .map(|minisc| {
@ -165,7 +165,7 @@ macro_rules! impl_node_opcode_two {
std::sync::Arc::new(b_minisc), std::sync::Arc::new(b_minisc),
))?; ))?;
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok((minisc, a_keymap, $crate::keys::merge_networks(&a_networks, &b_networks))) Ok((minisc, a_keymap, $crate::keys::merge_networks(&a_networks, &b_networks)))
}) })
@ -197,7 +197,7 @@ macro_rules! impl_node_opcode_three {
std::sync::Arc::new(c_minisc), std::sync::Arc::new(c_minisc),
))?; ))?;
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok((minisc, a_keymap, networks)) Ok((minisc, a_keymap, networks))
}) })
@ -243,7 +243,7 @@ macro_rules! apply_modifier {
), ),
)?; )?;
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok((minisc, keymap, networks)) Ok((minisc, keymap, networks))
}) })

4
src/descriptor/mod.rs
View File

@ -238,13 +238,13 @@ pub(crate) fn into_wallet_descriptor_checked<T: IntoWalletDescriptor>(
#[doc(hidden)] #[doc(hidden)]
/// Used internally mainly by the `descriptor!()` and `fragment!()` macros /// Used internally mainly by the `descriptor!()` and `fragment!()` macros
pub trait CheckMiniscript<Ctx: miniscript::ScriptContext> { pub trait CheckMiniscript<Ctx: miniscript::ScriptContext> {
fn check_minsicript(&self) -> Result<(), miniscript::Error>; fn check_miniscript(&self) -> Result<(), miniscript::Error>;
} }
impl<Ctx: miniscript::ScriptContext, Pk: miniscript::MiniscriptKey> CheckMiniscript<Ctx> impl<Ctx: miniscript::ScriptContext, Pk: miniscript::MiniscriptKey> CheckMiniscript<Ctx>
for miniscript::Miniscript<Pk, Ctx> for miniscript::Miniscript<Pk, Ctx>
{ {
fn check_minsicript(&self) -> Result<(), miniscript::Error> { fn check_miniscript(&self) -> Result<(), miniscript::Error> {
Ctx::check_global_validity(self)?; Ctx::check_global_validity(self)?;
Ok(()) Ok(())

6
src/keys/mod.rs
View File

@ -748,7 +748,7 @@ pub fn make_pk<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?; let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?;
let minisc = Miniscript::from_ast(Terminal::PkK(key))?; let minisc = Miniscript::from_ast(Terminal::PkK(key))?;
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok((minisc, key_map, valid_networks)) Ok((minisc, key_map, valid_networks))
} }
@ -762,7 +762,7 @@ pub fn make_pkh<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?; let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?;
let minisc = Miniscript::from_ast(Terminal::PkH(key))?; let minisc = Miniscript::from_ast(Terminal::PkH(key))?;
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok((minisc, key_map, valid_networks)) Ok((minisc, key_map, valid_networks))
} }
@ -777,7 +777,7 @@ pub fn make_multi<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
let (pks, key_map, valid_networks) = expand_multi_keys(pks, secp)?; let (pks, key_map, valid_networks) = expand_multi_keys(pks, secp)?;
let minisc = Miniscript::from_ast(Terminal::Multi(thresh, pks))?; let minisc = Miniscript::from_ast(Terminal::Multi(thresh, pks))?;
minisc.check_minsicript()?; minisc.check_miniscript()?;
Ok((minisc, key_map, valid_networks)) Ok((minisc, key_map, valid_networks))
} }