Skip to content

Commit 0da65ac

Browse files
getonggetong
committed
update code
1 parent 9044a4e commit 0da65ac

File tree

12 files changed

+63
-63
lines changed

12 files changed

+63
-63
lines changed

‎crates/bdk/src/descriptor/dsl.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ mod test {
936936

937937
#[test]
938938
fn test_bip32_legacy_descriptors() {
939-
let xprv = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
939+
let xprv = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
940940

941941
let path = bip32::DerivationPath::from_str("m/0").unwrap();
942942
let desc_key = (xprv, path.clone()).into_descriptor_key().unwrap();
@@ -981,7 +981,7 @@ mod test {
981981

982982
#[test]
983983
fn test_bip32_segwitv0_descriptors() {
984-
let xprv = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
984+
let xprv = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
985985

986986
let path = bip32::DerivationPath::from_str("m/0").unwrap();
987987
let desc_key = (xprv, path.clone()).into_descriptor_key().unwrap();
@@ -1038,10 +1038,10 @@ mod test {
10381038

10391039
#[test]
10401040
fn test_dsl_sortedmulti() {
1041-
let key_1 = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
1041+
let key_1 = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
10421042
let path_1 = bip32::DerivationPath::from_str("m/0").unwrap();
10431043

1044-
let key_2 = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPegBHHnq7YEgM815dG24M2Jk5RVqipgDxF1HJ1tsnT815X5Fd5FRfMVUs8NZs9XCb6y9an8hRPThnhfwfXJ36intaekySHGF").unwrap();
1044+
let key_2 = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPegBHHnq7YEgM815dG24M2Jk5RVqipgDxF1HJ1tsnT815X5Fd5FRfMVUs8NZs9XCb6y9an8hRPThnhfwfXJ36intaekySHGF").unwrap();
10451045
let path_2 = bip32::DerivationPath::from_str("m/1").unwrap();
10461046

10471047
let desc_key1 = (key_1, path_1);
@@ -1097,7 +1097,7 @@ mod test {
10971097
// - verify the valid_networks returned is correctly computed based on the keys present in the descriptor
10981098
#[test]
10991099
fn test_valid_networks() {
1100-
let xprv = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
1100+
let xprv = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
11011101
let path = bip32::DerivationPath::from_str("m/0").unwrap();
11021102
let desc_key = (xprv, path).into_descriptor_key().unwrap();
11031103

@@ -1107,7 +1107,7 @@ mod test {
11071107
[Testnet, Regtest, Signet].iter().cloned().collect()
11081108
);
11091109

1110-
let xprv = bip32::ExtendedPrivKey::from_str("xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi").unwrap();
1110+
let xprv = bip32::Xpriv::from_str("xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi").unwrap();
11111111
let path = bip32::DerivationPath::from_str("m/10/20/30/40").unwrap();
11121112
let desc_key = (xprv, path).into_descriptor_key().unwrap();
11131113

@@ -1120,15 +1120,15 @@ mod test {
11201120
fn test_key_maps_merged() {
11211121
let secp = Secp256k1::new();
11221122

1123-
let xprv1 = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
1123+
let xprv1 = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
11241124
let path1 = bip32::DerivationPath::from_str("m/0").unwrap();
11251125
let desc_key1 = (xprv1, path1.clone()).into_descriptor_key().unwrap();
11261126

1127-
let xprv2 = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPegBHHnq7YEgM815dG24M2Jk5RVqipgDxF1HJ1tsnT815X5Fd5FRfMVUs8NZs9XCb6y9an8hRPThnhfwfXJ36intaekySHGF").unwrap();
1127+
let xprv2 = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPegBHHnq7YEgM815dG24M2Jk5RVqipgDxF1HJ1tsnT815X5Fd5FRfMVUs8NZs9XCb6y9an8hRPThnhfwfXJ36intaekySHGF").unwrap();
11281128
let path2 = bip32::DerivationPath::from_str("m/2147483647'/0").unwrap();
11291129
let desc_key2 = (xprv2, path2.clone()).into_descriptor_key().unwrap();
11301130

1131-
let xprv3 = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPdZXrcHNLf5JAJWFAoJ2TrstMRdSKtEggz6PddbuSkvHKM9oKJyFgZV1B7rw8oChspxyYbtmEXYyg1AjfWbL3ho3XHDpHRZf").unwrap();
1131+
let xprv3 = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPdZXrcHNLf5JAJWFAoJ2TrstMRdSKtEggz6PddbuSkvHKM9oKJyFgZV1B7rw8oChspxyYbtmEXYyg1AjfWbL3ho3XHDpHRZf").unwrap();
11321132
let path3 = bip32::DerivationPath::from_str("m/10/20/30/40").unwrap();
11331133
let desc_key3 = (xprv3, path3.clone()).into_descriptor_key().unwrap();
11341134

@@ -1152,7 +1152,7 @@ mod test {
11521152
#[test]
11531153
fn test_script_context_validation() {
11541154
// this compiles
1155-
let xprv = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
1155+
let xprv = bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
11561156
let path = bip32::DerivationPath::from_str("m/0").unwrap();
11571157
let desc_key: DescriptorKey<Legacy> = (xprv, path).into_descriptor_key().unwrap();
11581158

‎crates/bdk/src/descriptor/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ mod test {
726726

727727
let secp = Secp256k1::new();
728728

729-
let xprv = bip32::ExtendedPrivKey::from_str("xprv9s21ZrQH143K3c3gF1DUWpWNr2SG2XrG8oYPpqYh7hoWsJy9NjabErnzriJPpnGHyKz5NgdXmq1KVbqS1r4NXdCoKitWg5e86zqXHa8kxyB").unwrap();
729+
let xprv = bip32::Xpriv::from_str("xprv9s21ZrQH143K3c3gF1DUWpWNr2SG2XrG8oYPpqYh7hoWsJy9NjabErnzriJPpnGHyKz5NgdXmq1KVbqS1r4NXdCoKitWg5e86zqXHa8kxyB").unwrap();
730730
let path = bip32::DerivationPath::from_str("m/0").unwrap();
731731

732732
// here `to_descriptor_key` will set the valid networks for the key to only mainnet, since
@@ -745,7 +745,7 @@ mod test {
745745
let mut xprv_testnet = xprv;
746746
xprv_testnet.network = Network::Testnet;
747747

748-
let xpub_testnet = bip32::ExtendedPubKey::from_priv(&secp, &xprv_testnet);
748+
let xpub_testnet = bip32::Xpub::from_priv(&secp, &xprv_testnet);
749749
let desc_pubkey = DescriptorPublicKey::XPub(DescriptorXKey {
750750
xkey: xpub_testnet,
751751
origin: None,
@@ -835,7 +835,7 @@ mod test {
835835
fn test_descriptor_from_str_from_output_of_macro() {
836836
let secp = Secp256k1::new();
837837

838-
let tpub = bip32::ExtendedPubKey::from_str("tpubD6NzVbkrYhZ4XHndKkuB8FifXm8r5FQHwrN6oZuWCz13qb93rtgKvD4PQsqC4HP4yhV3tA2fqr2RbY5mNXfM7RxXUoeABoDtsFUq2zJq6YK").unwrap();
838+
let tpub = bip32::Xpub::from_str("tpubD6NzVbkrYhZ4XHndKkuB8FifXm8r5FQHwrN6oZuWCz13qb93rtgKvD4PQsqC4HP4yhV3tA2fqr2RbY5mNXfM7RxXUoeABoDtsFUq2zJq6YK").unwrap();
839839
let path = bip32::DerivationPath::from_str("m/1/2").unwrap();
840840
let key = (tpub, path).into_descriptor_key().unwrap();
841841

‎crates/bdk/src/descriptor/policy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,8 +1184,8 @@ mod test {
11841184
secp: &SecpCtx,
11851185
) -> (DescriptorKey<Ctx>, DescriptorKey<Ctx>, Fingerprint) {
11861186
let path = bip32::DerivationPath::from_str(path).unwrap();
1187-
let tprv = bip32::ExtendedPrivKey::from_str(tprv).unwrap();
1188-
let tpub = bip32::ExtendedPubKey::from_priv(secp, &tprv);
1187+
let tprv = bip32::Xpriv::from_str(tprv).unwrap();
1188+
let tpub = bip32::Xpub::from_priv(secp, &tprv);
11891189
let fingerprint = tprv.fingerprint(secp);
11901190
let prvkey = (tprv, path.clone()).into_descriptor_key().unwrap();
11911191
let pubkey = (tpub, path).into_descriptor_key().unwrap();

‎crates/bdk/src/descriptor/template.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ impl<K: IntoDescriptorKey<Tap>> DescriptorTemplate for P2TR<K> {
195195
/// # use bdk::wallet::AddressIndex::New;
196196
/// use bdk::template::Bip44;
197197
///
198-
/// let key = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
198+
/// let key = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
199199
/// let mut wallet = Wallet::new_no_persist(
200200
/// Bip44(key.clone(), KeychainKind::External),
201201
/// Some(Bip44(key, KeychainKind::Internal)),
@@ -232,7 +232,7 @@ impl<K: DerivableKey<Legacy>> DescriptorTemplate for Bip44<K> {
232232
/// # use bdk::wallet::AddressIndex::New;
233233
/// use bdk::template::Bip44Public;
234234
///
235-
/// let key = bitcoin::bip32::ExtendedPubKey::from_str("tpubDDDzQ31JkZB7VxUr9bjvBivDdqoFLrDPyLWtLapArAi51ftfmCb2DPxwLQzX65iNcXz1DGaVvyvo6JQ6rTU73r2gqdEo8uov9QKRb7nKCSU")?;
235+
/// let key = bitcoin::bip32::Xpub::from_str("tpubDDDzQ31JkZB7VxUr9bjvBivDdqoFLrDPyLWtLapArAi51ftfmCb2DPxwLQzX65iNcXz1DGaVvyvo6JQ6rTU73r2gqdEo8uov9QKRb7nKCSU")?;
236236
/// let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f")?;
237237
/// let mut wallet = Wallet::new_no_persist(
238238
/// Bip44Public(key.clone(), fingerprint, KeychainKind::External),
@@ -270,7 +270,7 @@ impl<K: DerivableKey<Legacy>> DescriptorTemplate for Bip44Public<K> {
270270
/// # use bdk::wallet::AddressIndex::New;
271271
/// use bdk::template::Bip49;
272272
///
273-
/// let key = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
273+
/// let key = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
274274
/// let mut wallet = Wallet::new_no_persist(
275275
/// Bip49(key.clone(), KeychainKind::External),
276276
/// Some(Bip49(key, KeychainKind::Internal)),
@@ -307,7 +307,7 @@ impl<K: DerivableKey<Segwitv0>> DescriptorTemplate for Bip49<K> {
307307
/// # use bdk::wallet::AddressIndex::New;
308308
/// use bdk::template::Bip49Public;
309309
///
310-
/// let key = bitcoin::bip32::ExtendedPubKey::from_str("tpubDC49r947KGK52X5rBWS4BLs5m9SRY3pYHnvRrm7HcybZ3BfdEsGFyzCMzayi1u58eT82ZeyFZwH7DD6Q83E3fM9CpfMtmnTygnLfP59jL9L")?;
310+
/// let key = bitcoin::bip32::Xpub::from_str("tpubDC49r947KGK52X5rBWS4BLs5m9SRY3pYHnvRrm7HcybZ3BfdEsGFyzCMzayi1u58eT82ZeyFZwH7DD6Q83E3fM9CpfMtmnTygnLfP59jL9L")?;
311311
/// let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f")?;
312312
/// let mut wallet = Wallet::new_no_persist(
313313
/// Bip49Public(key.clone(), fingerprint, KeychainKind::External),
@@ -345,7 +345,7 @@ impl<K: DerivableKey<Segwitv0>> DescriptorTemplate for Bip49Public<K> {
345345
/// # use bdk::wallet::AddressIndex::New;
346346
/// use bdk::template::Bip84;
347347
///
348-
/// let key = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
348+
/// let key = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
349349
/// let mut wallet = Wallet::new_no_persist(
350350
/// Bip84(key.clone(), KeychainKind::External),
351351
/// Some(Bip84(key, KeychainKind::Internal)),
@@ -382,7 +382,7 @@ impl<K: DerivableKey<Segwitv0>> DescriptorTemplate for Bip84<K> {
382382
/// # use bdk::wallet::AddressIndex::New;
383383
/// use bdk::template::Bip84Public;
384384
///
385-
/// let key = bitcoin::bip32::ExtendedPubKey::from_str("tpubDC2Qwo2TFsaNC4ju8nrUJ9mqVT3eSgdmy1yPqhgkjwmke3PRXutNGRYAUo6RCHTcVQaDR3ohNU9we59brGHuEKPvH1ags2nevW5opEE9Z5Q")?;
385+
/// let key = bitcoin::bip32::Xpub::from_str("tpubDC2Qwo2TFsaNC4ju8nrUJ9mqVT3eSgdmy1yPqhgkjwmke3PRXutNGRYAUo6RCHTcVQaDR3ohNU9we59brGHuEKPvH1ags2nevW5opEE9Z5Q")?;
386386
/// let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f")?;
387387
/// let mut wallet = Wallet::new_no_persist(
388388
/// Bip84Public(key.clone(), fingerprint, KeychainKind::External),
@@ -420,7 +420,7 @@ impl<K: DerivableKey<Segwitv0>> DescriptorTemplate for Bip84Public<K> {
420420
/// # use bdk::wallet::AddressIndex::New;
421421
/// use bdk::template::Bip86;
422422
///
423-
/// let key = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
423+
/// let key = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPeZRHk4rTG6orPS2CRNFX3njhUXx5vj9qGog5ZMH4uGReDWN5kCkY3jmWEtWause41CDvBRXD1shKknAMKxT99o9qUTRVC6m")?;
424424
/// let mut wallet = Wallet::new_no_persist(
425425
/// Bip86(key.clone(), KeychainKind::External),
426426
/// Some(Bip86(key, KeychainKind::Internal)),
@@ -457,7 +457,7 @@ impl<K: DerivableKey<Tap>> DescriptorTemplate for Bip86<K> {
457457
/// # use bdk::wallet::AddressIndex::New;
458458
/// use bdk::template::Bip86Public;
459459
///
460-
/// let key = bitcoin::bip32::ExtendedPubKey::from_str("tpubDC2Qwo2TFsaNC4ju8nrUJ9mqVT3eSgdmy1yPqhgkjwmke3PRXutNGRYAUo6RCHTcVQaDR3ohNU9we59brGHuEKPvH1ags2nevW5opEE9Z5Q")?;
460+
/// let key = bitcoin::bip32::Xpub::from_str("tpubDC2Qwo2TFsaNC4ju8nrUJ9mqVT3eSgdmy1yPqhgkjwmke3PRXutNGRYAUo6RCHTcVQaDR3ohNU9we59brGHuEKPvH1ags2nevW5opEE9Z5Q")?;
461461
/// let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f")?;
462462
/// let mut wallet = Wallet::new_no_persist(
463463
/// Bip86Public(key.clone(), fingerprint, KeychainKind::External),
@@ -567,7 +567,7 @@ mod test {
567567
fn test_bip44_template_cointype() {
568568
use bitcoin::bip32::ChildNumber::{self, Hardened};
569569

570-
let xprvkey = bitcoin::bip32::ExtendedPrivKey::from_str("xprv9s21ZrQH143K2fpbqApQL69a4oKdGVnVN52R82Ft7d1pSqgKmajF62acJo3aMszZb6qQ22QsVECSFxvf9uyxFUvFYQMq3QbtwtRSMjLAhMf").unwrap();
570+
let xprvkey = bitcoin::bip32::Xpriv::from_str("xprv9s21ZrQH143K2fpbqApQL69a4oKdGVnVN52R82Ft7d1pSqgKmajF62acJo3aMszZb6qQ22QsVECSFxvf9uyxFUvFYQMq3QbtwtRSMjLAhMf").unwrap();
571571
assert_eq!(Network::Bitcoin, xprvkey.network);
572572
let xdesc = Bip44(xprvkey, KeychainKind::Internal)
573573
.build(Network::Bitcoin)
@@ -581,7 +581,7 @@ mod test {
581581
assert_matches!(coin_type, Hardened { index: 0 });
582582
}
583583

584-
let tprvkey = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
584+
let tprvkey = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
585585
assert_eq!(Network::Testnet, tprvkey.network);
586586
let tdesc = Bip44(tprvkey, KeychainKind::Internal)
587587
.build(Network::Testnet)
@@ -740,7 +740,7 @@ mod test {
740740
// BIP44 `pkh(key/44'/0'/0'/{0,1}/*)`
741741
#[test]
742742
fn test_bip44_template() {
743-
let prvkey = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
743+
let prvkey = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
744744
check(
745745
Bip44(prvkey, KeychainKind::External).build(Network::Bitcoin),
746746
false,
@@ -770,7 +770,7 @@ mod test {
770770
// BIP44 public `pkh(key/{0,1}/*)`
771771
#[test]
772772
fn test_bip44_public_template() {
773-
let pubkey = bitcoin::bip32::ExtendedPubKey::from_str("tpubDDDzQ31JkZB7VxUr9bjvBivDdqoFLrDPyLWtLapArAi51ftfmCb2DPxwLQzX65iNcXz1DGaVvyvo6JQ6rTU73r2gqdEo8uov9QKRb7nKCSU").unwrap();
773+
let pubkey = bitcoin::bip32::Xpub::from_str("tpubDDDzQ31JkZB7VxUr9bjvBivDdqoFLrDPyLWtLapArAi51ftfmCb2DPxwLQzX65iNcXz1DGaVvyvo6JQ6rTU73r2gqdEo8uov9QKRb7nKCSU").unwrap();
774774
let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f").unwrap();
775775
check(
776776
Bip44Public(pubkey, fingerprint, KeychainKind::External).build(Network::Bitcoin),
@@ -801,7 +801,7 @@ mod test {
801801
// BIP49 `sh(wpkh(key/49'/0'/0'/{0,1}/*))`
802802
#[test]
803803
fn test_bip49_template() {
804-
let prvkey = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
804+
let prvkey = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
805805
check(
806806
Bip49(prvkey, KeychainKind::External).build(Network::Bitcoin),
807807
true,
@@ -831,7 +831,7 @@ mod test {
831831
// BIP49 public `sh(wpkh(key/{0,1}/*))`
832832
#[test]
833833
fn test_bip49_public_template() {
834-
let pubkey = bitcoin::bip32::ExtendedPubKey::from_str("tpubDC49r947KGK52X5rBWS4BLs5m9SRY3pYHnvRrm7HcybZ3BfdEsGFyzCMzayi1u58eT82ZeyFZwH7DD6Q83E3fM9CpfMtmnTygnLfP59jL9L").unwrap();
834+
let pubkey = bitcoin::bip32::Xpub::from_str("tpubDC49r947KGK52X5rBWS4BLs5m9SRY3pYHnvRrm7HcybZ3BfdEsGFyzCMzayi1u58eT82ZeyFZwH7DD6Q83E3fM9CpfMtmnTygnLfP59jL9L").unwrap();
835835
let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f").unwrap();
836836
check(
837837
Bip49Public(pubkey, fingerprint, KeychainKind::External).build(Network::Bitcoin),
@@ -862,7 +862,7 @@ mod test {
862862
// BIP84 `wpkh(key/84'/0'/0'/{0,1}/*)`
863863
#[test]
864864
fn test_bip84_template() {
865-
let prvkey = bitcoin::bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
865+
let prvkey = bitcoin::bip32::Xpriv::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap();
866866
check(
867867
Bip84(prvkey, KeychainKind::External).build(Network::Bitcoin),
868868
true,
@@ -892,7 +892,7 @@ mod test {
892892
// BIP84 public `wpkh(key/{0,1}/*)`
893893
#[test]
894894
fn test_bip84_public_template() {
895-
let pubkey = bitcoin::bip32::ExtendedPubKey::from_str("tpubDC2Qwo2TFsaNC4ju8nrUJ9mqVT3eSgdmy1yPqhgkjwmke3PRXutNGRYAUo6RCHTcVQaDR3ohNU9we59brGHuEKPvH1ags2nevW5opEE9Z5Q").unwrap();
895+
let pubkey = bitcoin::bip32::Xpub::from_str("tpubDC2Qwo2TFsaNC4ju8nrUJ9mqVT3eSgdmy1yPqhgkjwmke3PRXutNGRYAUo6RCHTcVQaDR3ohNU9we59brGHuEKPvH1ags2nevW5opEE9Z5Q").unwrap();
896896
let fingerprint = bitcoin::bip32::Fingerprint::from_str("c55b303f").unwrap();
897897
check(
898898
Bip84Public(pubkey, fingerprint, KeychainKind::External).build(Network::Bitcoin),
@@ -924,7 +924,7 @@ mod test {
924924
// Used addresses in test vector in https://github.com/bitcoin/bips/blob/master/bip-0086.mediawiki
925925
#[test]
926926
fn test_bip86_template() {
927-
let prvkey = bitcoin::bip32::ExtendedPrivKey::from_str("xprv9s21ZrQH143K3GJpoapnV8SFfukcVBSfeCficPSGfubmSFDxo1kuHnLisriDvSnRRuL2Qrg5ggqHKNVpxR86QEC8w35uxmGoggxtQTPvfUu").unwrap();
927+
let prvkey = bitcoin::bip32::Xpriv::from_str("xprv9s21ZrQH143K3GJpoapnV8SFfukcVBSfeCficPSGfubmSFDxo1kuHnLisriDvSnRRuL2Qrg5ggqHKNVpxR86QEC8w35uxmGoggxtQTPvfUu").unwrap();
928928
check(
929929
Bip86(prvkey, KeychainKind::External).build(Network::Bitcoin),
930930
false,
@@ -955,7 +955,7 @@ mod test {
955955
// Used addresses in test vector in https://github.com/bitcoin/bips/blob/master/bip-0086.mediawiki
956956
#[test]
957957
fn test_bip86_public_template() {
958-
let pubkey = bitcoin::bip32::ExtendedPubKey::from_str("xpub6BgBgsespWvERF3LHQu6CnqdvfEvtMcQjYrcRzx53QJjSxarj2afYWcLteoGVky7D3UKDP9QyrLprQ3VCECoY49yfdDEHGCtMMj92pReUsQ").unwrap();
958+
let pubkey = bitcoin::bip32::Xpub::from_str("xpub6BgBgsespWvERF3LHQu6CnqdvfEvtMcQjYrcRzx53QJjSxarj2afYWcLteoGVky7D3UKDP9QyrLprQ3VCECoY49yfdDEHGCtMMj92pReUsQ").unwrap();
959959
let fingerprint = bitcoin::bip32::Fingerprint::from_str("73c5da0a").unwrap();
960960
check(
961961
Bip86Public(pubkey, fingerprint, KeychainKind::External).build(Network::Bitcoin),

0 commit comments

Comments
 (0)