Skip to content

Commit 759b0cf

Browse files
committed
Merge #78: elip150: test_vectors: add new case
5c50735 ci: cargo update cc (Leonardo Comandini) 333db24 elip150: test_vectors: add new case (Leonardo Comandini) Pull request description: With "bare" descriptor blinding key and xpub in the ordinary descriptor. ACKs for top commit: apoelstra: ACK 5c50735 Tree-SHA512: 26303100adf904394784071aed8b5427cb36259cdaf3e0324bfbfa99228ac2e2b2d04766f8d65588c19baede5e6eff8732941bcef626f1ae3e1e7694bdd8da51
2 parents 81cb214 + 5c50735 commit 759b0cf

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

contrib/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rustc --version
1010
# Pin dependencies required to build with Rust 1.58
1111
if cargo --version | grep "1\.58"; then
1212
cargo update -p byteorder --precise 1.4.3
13+
cargo update -p cc --precise 1.0.94
1314
fi
1415

1516
# Format if told to

fuzz/fuzz.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cargo --version
1919
rustc --version
2020

2121
cargo update -p byteorder --precise 1.4.3
22+
cargo update -p cc --precise 1.0.94
2223

2324
# Testing
2425
cargo install --force honggfuzz --no-default-features

src/confidential/mod.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,13 +404,22 @@ mod tests {
404404
conf_addr: "lq1pq26fndnz8ef6umlz6e2755sm6j5jwxv3tdt2295mr4mx6ux0uf8vcc2tuvwx7k7g9kvhhpux07vqpm3qjj8uwdj94650265ustv0xy8z8wfacw9e5a5t",
405405
unconf_addr: "ex1pv997x8r0t0yzmxtms7r8lxqqacsffr78xez6a284d2wg9k8nzr3qxa9kvf",
406406
},
407+
// Bare, P2WPKH
407408
ConfidentialTest {
408-
key: Key::Bare(single_ct_key),
409+
key: Key::Bare(single_ct_key.clone()),
409410
descriptor: crate::Descriptor::new_wpkh(single_spk_key).unwrap(),
410411
descriptor_str: format!("ct(02dce16018bbbb8e36de7b394df5b5166e9adb7498be7d881a85a09aeecf76b623,elwpkh(03774eec7a3d550d18e9f89414152025b3b0ad6a342b19481f702d843cff06dfc4))#h5e0p6m9"),
411412
conf_addr: "lq1qq0r6pegudzm0tzpszelc34qjln4fdxawgwmgnza63wwpzdy6jrm0grmqvvk2ce5ksnxcs9ecgtnryt7xg3406y5ccl0k2glns",
412413
unconf_addr: "ex1qpasxxt9vv6tgfnvgzuuy9e3j9lryg6hawrval4",
413414
},
415+
// Bare, P2WPKH xpub
416+
ConfidentialTest {
417+
key: Key::Bare(single_ct_key),
418+
descriptor: crate::Descriptor::new_wpkh(spk_key.clone()).unwrap(),
419+
descriptor_str: format!("ct(02dce16018bbbb8e36de7b394df5b5166e9adb7498be7d881a85a09aeecf76b623,elwpkh({}))#x6sc2de2", spk_key),
420+
conf_addr: "lq1qqwkeuelr466ue5u8e0lz3a27q4yk93qnupry5h3q4h9pjpf8vrrzvknpl78t02k2xqgdh9ltmfmpy9ssk7qfvwt93dvuvssha",
421+
unconf_addr: "ex1qtfsllr4h4t9rqyxmjl4a5asjzcgt0qyktcafre",
422+
},
414423
];
415424

416425
for test in &tests {

0 commit comments

Comments
 (0)