Skip to content

Commit dca56db

Browse files
committed
test(selection): Refactor tests to reuse key strings
Previously, we had a string constants for test descriptors and test keys where the test keys were also hardcoded in the test descriptors. We remove the hard coded test descriptor and rename variables for clarity.
1 parent 96b9f88 commit dca56db

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

src/selection.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -356,16 +356,15 @@ mod tests {
356356
use miniscript::{plan::Assets, Descriptor, DescriptorPublicKey};
357357
use rand_core::OsRng;
358358

359-
const TEST_DESCRIPTOR: &str = "tr([83737d5e/86h/1h/0h]tpubDDR5GgtoxS8fJyjjvdahN4VzV5DV6jtbcyvVXhEKq2XtpxjxBXmxH3r8QrNbQqHg4bJM1EGkxi7Pjfkgnui9jQWqS7kxHvX6rhUeriLDKxz/0/*)";
360-
const TEST_DESCRIPTOR_PK: &str = "[83737d5e/86h/1h/0h]tpubDDR5GgtoxS8fJyjjvdahN4VzV5DV6jtbcyvVXhEKq2XtpxjxBXmxH3r8QrNbQqHg4bJM1EGkxi7Pjfkgnui9jQWqS7kxHvX6rhUeriLDKxz/0/*";
361-
const TEST_HEX_PK: &str = "032b0558078bec38694a84933d659303e2575dae7e91685911454115bfd64487e3";
359+
const TEST_KEY_HEX: &str = "032b0558078bec38694a84933d659303e2575dae7e91685911454115bfd64487e3";
360+
const TEST_KEY_TR: &str = "[83737d5e/86h/1h/0h]tpubDDR5GgtoxS8fJyjjvdahN4VzV5DV6jtbcyvVXhEKq2XtpxjxBXmxH3r8QrNbQqHg4bJM1EGkxi7Pjfkgnui9jQWqS7kxHvX6rhUeriLDKxz/0/*";
362361

363362
fn setup_cltv_input(
364363
cltv: absolute::LockTime,
365364
) -> anyhow::Result<(Input, Descriptor<DescriptorPublicKey>)> {
366365
let secp = Secp256k1::new();
367-
let desc_str = format!("wsh(and_v(v:pk({TEST_HEX_PK}),after({cltv})))");
368-
let desc_pk: DescriptorPublicKey = TEST_HEX_PK.parse()?;
366+
let desc_str = format!("wsh(and_v(v:pk({TEST_KEY_HEX}),after({cltv})))");
367+
let desc_pk: DescriptorPublicKey = TEST_KEY_HEX.parse()?;
369368
let (desc, _) = Descriptor::parse_descriptor(&secp, &desc_str)?;
370369
let plan = desc
371370
.at_derivation_index(0)?
@@ -483,12 +482,12 @@ mod tests {
483482

484483
pub fn setup_test_input(confirmation_height: u32) -> anyhow::Result<Input> {
485484
let secp = Secp256k1::new();
486-
let desc = Descriptor::parse_descriptor(&secp, TEST_DESCRIPTOR)
485+
let desc = Descriptor::parse_descriptor(&secp, &format!("tr({TEST_KEY_TR})"))
487486
.unwrap()
488487
.0;
489488
let def_desc = desc.at_derivation_index(0).unwrap();
490489
let script_pubkey = def_desc.script_pubkey();
491-
let desc_pk: DescriptorPublicKey = TEST_DESCRIPTOR_PK.parse()?;
490+
let desc_pk: DescriptorPublicKey = TEST_KEY_TR.parse()?;
492491
let assets = Assets::new().add(desc_pk);
493492
let plan = def_desc.plan(&assets).expect("failed to create plan");
494493

@@ -674,8 +673,7 @@ mod tests {
674673
// `assets`, forcing planning to use the script-path leaf (which sets
675674
// `plan.relative_timelock`).
676675
let secp = Secp256k1::new();
677-
let desc_str =
678-
format!("tr({TEST_HEX_PK},and_v(v:pk({TEST_DESCRIPTOR_PK}),older({csv_blocks})))");
676+
let desc_str = format!("tr({TEST_KEY_HEX},and_v(v:pk({TEST_KEY_TR}),older({csv_blocks})))");
679677
let desc = Descriptor::parse_descriptor(&secp, &desc_str)?
680678
.0
681679
.at_derivation_index(0)?;
@@ -689,7 +687,7 @@ mod tests {
689687
}],
690688
};
691689
let assets = Assets::new()
692-
.add(TEST_DESCRIPTOR_PK.parse::<DescriptorPublicKey>()?)
690+
.add(TEST_KEY_TR.parse::<DescriptorPublicKey>()?)
693691
.older(relative::LockTime::from_height(csv_blocks));
694692
let plan = desc.plan(&assets).expect("script-path plan with CSV");
695693
let status = crate::ConfirmationStatus {

0 commit comments

Comments
 (0)