Skip to content

Commit

Permalink
Merge #78: elip150: test_vectors: add new case
Browse files Browse the repository at this point in the history
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
  • Loading branch information
apoelstra committed Apr 24, 2024
2 parents 81cb214 + 5c50735 commit 759b0cf
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions contrib/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rustc --version
# Pin dependencies required to build with Rust 1.58
if cargo --version | grep "1\.58"; then
cargo update -p byteorder --precise 1.4.3
cargo update -p cc --precise 1.0.94
fi

# Format if told to
Expand Down
1 change: 1 addition & 0 deletions fuzz/fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cargo --version
rustc --version

cargo update -p byteorder --precise 1.4.3
cargo update -p cc --precise 1.0.94

# Testing
cargo install --force honggfuzz --no-default-features
Expand Down
11 changes: 10 additions & 1 deletion src/confidential/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,22 @@ mod tests {
conf_addr: "lq1pq26fndnz8ef6umlz6e2755sm6j5jwxv3tdt2295mr4mx6ux0uf8vcc2tuvwx7k7g9kvhhpux07vqpm3qjj8uwdj94650265ustv0xy8z8wfacw9e5a5t",
unconf_addr: "ex1pv997x8r0t0yzmxtms7r8lxqqacsffr78xez6a284d2wg9k8nzr3qxa9kvf",
},
// Bare, P2WPKH
ConfidentialTest {
key: Key::Bare(single_ct_key),
key: Key::Bare(single_ct_key.clone()),
descriptor: crate::Descriptor::new_wpkh(single_spk_key).unwrap(),
descriptor_str: format!("ct(02dce16018bbbb8e36de7b394df5b5166e9adb7498be7d881a85a09aeecf76b623,elwpkh(03774eec7a3d550d18e9f89414152025b3b0ad6a342b19481f702d843cff06dfc4))#h5e0p6m9"),
conf_addr: "lq1qq0r6pegudzm0tzpszelc34qjln4fdxawgwmgnza63wwpzdy6jrm0grmqvvk2ce5ksnxcs9ecgtnryt7xg3406y5ccl0k2glns",
unconf_addr: "ex1qpasxxt9vv6tgfnvgzuuy9e3j9lryg6hawrval4",
},
// Bare, P2WPKH xpub
ConfidentialTest {
key: Key::Bare(single_ct_key),
descriptor: crate::Descriptor::new_wpkh(spk_key.clone()).unwrap(),
descriptor_str: format!("ct(02dce16018bbbb8e36de7b394df5b5166e9adb7498be7d881a85a09aeecf76b623,elwpkh({}))#x6sc2de2", spk_key),
conf_addr: "lq1qqwkeuelr466ue5u8e0lz3a27q4yk93qnupry5h3q4h9pjpf8vrrzvknpl78t02k2xqgdh9ltmfmpy9ssk7qfvwt93dvuvssha",
unconf_addr: "ex1qtfsllr4h4t9rqyxmjl4a5asjzcgt0qyktcafre",
},
];

for test in &tests {
Expand Down

0 comments on commit 759b0cf

Please sign in to comment.