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

[descriptor] Fix compile errors after rebase

Browse Source
This commit is contained in:
Steve Myers 2020-10-19 16:58:55 -07:00
parent e31f5306d2
commit 3a80e87ccb
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/descriptor/dsl.rs
View File

@ -434,7 +434,7 @@ mod test {
let child_desc = if desc.is_fixed() { let child_desc = if desc.is_fixed() {
desc.clone() desc.clone()
} else { } else {
desc.derive(&[ChildNumber::from_normal_idx(index).unwrap()]) desc.derive(ChildNumber::from_normal_idx(index).unwrap())
}; };
let address = child_desc.address(Regtest); let address = child_desc.address(Regtest);
if address.is_some() { if address.is_some() {

6
src/descriptor/policy.rs
View File

@ -980,7 +980,7 @@ mod test {
let (prvkey, pubkey, fingerprint) = setup_keys(TPRV0_STR); let (prvkey, pubkey, fingerprint) = setup_keys(TPRV0_STR);
let desc = descriptor!(wpkh(pubkey)).unwrap(); let desc = descriptor!(wpkh(pubkey)).unwrap();
let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap(); let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap();
let single_key = wallet_desc.derive(&[ChildNumber::from_normal_idx(0).unwrap()]); let single_key = wallet_desc.derive(ChildNumber::from_normal_idx(0).unwrap());
let signers_container = Arc::new(SignersContainer::from(keymap)); let signers_container = Arc::new(SignersContainer::from(keymap));
let policy = single_key let policy = single_key
.extract_policy(signers_container) .extract_policy(signers_container)
@ -994,7 +994,7 @@ mod test {
let desc = descriptor!(wpkh(prvkey)).unwrap(); let desc = descriptor!(wpkh(prvkey)).unwrap();
let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap(); let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap();
let single_key = wallet_desc.derive(&[ChildNumber::from_normal_idx(0).unwrap()]); let single_key = wallet_desc.derive(ChildNumber::from_normal_idx(0).unwrap());
let signers_container = Arc::new(SignersContainer::from(keymap)); let signers_container = Arc::new(SignersContainer::from(keymap));
let policy = single_key let policy = single_key
.extract_policy(signers_container) .extract_policy(signers_container)
@ -1016,7 +1016,7 @@ mod test {
let (prvkey1, _pubkey1, fingerprint1) = setup_keys(TPRV1_STR); let (prvkey1, _pubkey1, fingerprint1) = setup_keys(TPRV1_STR);
let desc = descriptor!(sh(multi 1, pubkey0, prvkey1)).unwrap(); let desc = descriptor!(sh(multi 1, pubkey0, prvkey1)).unwrap();
let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap(); let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap();
let single_key = wallet_desc.derive(&[ChildNumber::from_normal_idx(0).unwrap()]); let single_key = wallet_desc.derive(ChildNumber::from_normal_idx(0).unwrap());
let signers_container = Arc::new(SignersContainer::from(keymap)); let signers_container = Arc::new(SignersContainer::from(keymap));
let policy = single_key let policy = single_key
.extract_policy(signers_container) .extract_policy(signers_container)

2
src/descriptor/template.rs
View File

@ -451,7 +451,7 @@ mod test {
let child_desc = if desc.is_fixed() { let child_desc = if desc.is_fixed() {
desc.clone() desc.clone()
} else { } else {
desc.derive(&[ChildNumber::from_normal_idx(index).unwrap()]) desc.derive(ChildNumber::from_normal_idx(index).unwrap())
}; };
let address = child_desc.address(Regtest).unwrap(); let address = child_desc.address(Regtest).unwrap();
assert_eq!(address.to_string(), *expected.get(i).unwrap()); assert_eq!(address.to_string(), *expected.get(i).unwrap());

3
src/lib.rs
View File

@ -66,6 +66,9 @@ pub mod cli;
extern crate testutils; extern crate testutils;
#[cfg(test)] #[cfg(test)]
#[macro_use] #[macro_use]
extern crate testutils_macros;
#[cfg(test)]
#[macro_use]
extern crate serial_test; extern crate serial_test;
#[macro_use] #[macro_use]