From b9fc06195beab8eab4c4c6224dc069ebd5106729 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 23 Nov 2021 12:59:08 -0500 Subject: [PATCH] Fix typo in check_miniscript method declaration and use --- src/descriptor/dsl.rs | 12 ++++++------ src/descriptor/mod.rs | 4 ++-- src/keys/mod.rs | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/descriptor/dsl.rs b/src/descriptor/dsl.rs index b9acce3b..3493bbf3 100644 --- a/src/descriptor/dsl.rs +++ b/src/descriptor/dsl.rs @@ -84,7 +84,7 @@ macro_rules! impl_leaf_opcode { ) .map_err($crate::descriptor::DescriptorError::Miniscript) .and_then(|minisc| { - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok(minisc) }) .map(|minisc| { @@ -108,7 +108,7 @@ macro_rules! impl_leaf_opcode_value { ) .map_err($crate::descriptor::DescriptorError::Miniscript) .and_then(|minisc| { - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok(minisc) }) .map(|minisc| { @@ -132,7 +132,7 @@ macro_rules! impl_leaf_opcode_value_two { ) .map_err($crate::descriptor::DescriptorError::Miniscript) .and_then(|minisc| { - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok(minisc) }) .map(|minisc| { @@ -165,7 +165,7 @@ macro_rules! impl_node_opcode_two { std::sync::Arc::new(b_minisc), ))?; - minisc.check_minsicript()?; + minisc.check_miniscript()?; 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), ))?; - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok((minisc, a_keymap, networks)) }) @@ -243,7 +243,7 @@ macro_rules! apply_modifier { ), )?; - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok((minisc, keymap, networks)) }) diff --git a/src/descriptor/mod.rs b/src/descriptor/mod.rs index 69247905..cfd9202f 100644 --- a/src/descriptor/mod.rs +++ b/src/descriptor/mod.rs @@ -238,13 +238,13 @@ pub(crate) fn into_wallet_descriptor_checked( #[doc(hidden)] /// Used internally mainly by the `descriptor!()` and `fragment!()` macros pub trait CheckMiniscript { - fn check_minsicript(&self) -> Result<(), miniscript::Error>; + fn check_miniscript(&self) -> Result<(), miniscript::Error>; } impl CheckMiniscript for miniscript::Miniscript { - fn check_minsicript(&self) -> Result<(), miniscript::Error> { + fn check_miniscript(&self) -> Result<(), miniscript::Error> { Ctx::check_global_validity(self)?; Ok(()) diff --git a/src/keys/mod.rs b/src/keys/mod.rs index d22b03f1..9c835dbf 100644 --- a/src/keys/mod.rs +++ b/src/keys/mod.rs @@ -748,7 +748,7 @@ pub fn make_pk, Ctx: ScriptContext>( let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?; let minisc = Miniscript::from_ast(Terminal::PkK(key))?; - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok((minisc, key_map, valid_networks)) } @@ -762,7 +762,7 @@ pub fn make_pkh, Ctx: ScriptContext>( let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?; let minisc = Miniscript::from_ast(Terminal::PkH(key))?; - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok((minisc, key_map, valid_networks)) } @@ -777,7 +777,7 @@ pub fn make_multi, Ctx: ScriptContext>( let (pks, key_map, valid_networks) = expand_multi_keys(pks, secp)?; let minisc = Miniscript::from_ast(Terminal::Multi(thresh, pks))?; - minisc.check_minsicript()?; + minisc.check_miniscript()?; Ok((minisc, key_map, valid_networks)) }