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

Fix clippy warnings inside testutils macro

Browse Source 
Now that it's inside the main repo clippy is having a go at me.
This commit is contained in:
LLFourn 2021-05-19 16:10:06 +10:00
parent 00bdf08f2a
commit 5b194c268d
No known key found for this signature in database
GPG Key ID: A27093B54DA11F65
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/testutils/mod.rs
View File

@ -123,20 +123,13 @@ macro_rules! testutils {
( @e $descriptors:expr, $child:expr ) => ({ testutils!(@external $descriptors, $child) }); ( @e $descriptors:expr, $child:expr ) => ({ testutils!(@external $descriptors, $child) });
( @i $descriptors:expr, $child:expr ) => ({ testutils!(@internal $descriptors, $child) }); ( @i $descriptors:expr, $child:expr ) => ({ testutils!(@internal $descriptors, $child) });
( @tx ( $( ( $( $addr:tt )* ) => $amount:expr ),+ ) $( ( @locktime $locktime:expr ) )* $( ( @confirmations $confirmations:expr ) )* $( ( @replaceable $replaceable:expr ) )* ) => ({ ( @tx ( $( ( $( $addr:tt )* ) => $amount:expr ),+ ) $( ( @locktime $locktime:expr ) )? $( ( @confirmations $confirmations:expr ) )? $( ( @replaceable $replaceable:expr ) )? ) => ({
let mut outs = Vec::new(); let outs = vec![$( $crate::testutils::TestIncomingOutput::new($amount, testutils!( $($addr)* ))),+];
$( outs.push($crate::testutils::TestIncomingOutput::new($amount, testutils!( $($addr)* ))); )+
#[allow(unused_mut)]
let mut locktime = None::<i64>;
$( locktime = Some($locktime); )*
#[allow(unused_assignments, unused_mut)] let locktime = None::<i64>$(.or(Some($locktime)))?;
let mut min_confirmations = None::<u64>;
$( min_confirmations = Some($confirmations); )*
#[allow(unused_assignments, unused_mut)] let min_confirmations = None::<u64>$(.or(Some($confirmations)))?;
let mut replaceable = None::<bool>; let replaceable = None::<bool>$(.or(Some($replaceable)))?;
$( replaceable = Some($replaceable); )*
$crate::testutils::TestIncomingTx::new(outs, min_confirmations, locktime, replaceable) $crate::testutils::TestIncomingTx::new(outs, min_confirmations, locktime, replaceable)
}); });
@ -156,13 +149,8 @@ macro_rules! testutils {
&seed, &seed,
); );
#[allow(unused_assignments)] let external_path = None::<String>$(.or(Some($external_path.to_string())))?;
let mut external_path = None::<String>; let internal_path = None::<String>$(.or(Some($internal_path.to_string())))?;
$( external_path = Some($external_path.to_string()); )?
#[allow(unused_assignments)]
let mut internal_path = None::<String>;
$( internal_path = Some($internal_path.to_string()); )?
(key.unwrap().to_string(), external_path, internal_path) (key.unwrap().to_string(), external_path, internal_path)
}); });
@ -189,7 +177,7 @@ macro_rules! testutils {
map map
}); });
( @descriptors ( $external_descriptor:expr ) $( ( $internal_descriptor:expr ) )* $( ( @keys $( $keys:tt )* ) )* ) => ({ ( @descriptors ( $external_descriptor:expr ) $( ( $internal_descriptor:expr ) )? $( ( @keys $( $keys:tt )* ) )* ) => ({
use std::str::FromStr; use std::str::FromStr;
use std::collections::HashMap; use std::collections::HashMap;
use miniscript::descriptor::Descriptor; use miniscript::descriptor::Descriptor;
@ -218,9 +206,7 @@ macro_rules! testutils {
}); });
let external = external.to_string(); let external = external.to_string();
#[allow(unused_assignments, unused_mut)] let internal = None::<String>$(.or({
let mut internal = None::<String>;
$(
let string_internal: Descriptor<String> = FromStr::from_str($internal_descriptor).unwrap(); let string_internal: Descriptor<String> = FromStr::from_str($internal_descriptor).unwrap();
let string_internal: Descriptor<String> = string_internal.translate_pk_infallible::<_, _>(|k| { let string_internal: Descriptor<String> = string_internal.translate_pk_infallible::<_, _>(|k| {
@ -236,8 +222,8 @@ macro_rules! testutils {
kh.clone() kh.clone()
} }
}); });
internal = Some(string_internal.to_string()); Some(string_internal.to_string())
)* }))?;
(external, internal) (external, internal)
}) })