feat!(examples,test): use NetworkKind

Author: luisschwab

wallet/examples/mnemonic_to_descriptors.rs

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 Bitcoin Dev Kit Developers
+// Copyright (c) 2020-2025 Bitcoin Dev Kit Developers
 //
 // This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
 // or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -9,7 +9,7 @@
 use anyhow::anyhow;
 use bdk_wallet::bitcoin::bip32::DerivationPath;
 use bdk_wallet::bitcoin::secp256k1::Secp256k1;
-use bdk_wallet::bitcoin::Network;
+use bdk_wallet::bitcoin::NetworkKind;
 use bdk_wallet::descriptor;
 use bdk_wallet::descriptor::IntoWalletDescriptor;
 use bdk_wallet::keys::bip39::{Language, Mnemonic, WordCount};
@@ -18,32 +18,32 @@ use bdk_wallet::miniscript::Tap;
 use std::str::FromStr;
 
 /// This example demonstrates how to generate a mnemonic phrase
-/// using BDK and use that to generate a descriptor string.
+/// using BDK and use that mnemonic phrase to generate a descriptor string.
 #[allow(clippy::print_stdout)]
 fn main() -> Result<(), anyhow::Error> {
     let secp = Secp256k1::new();
 
-    // In this example we are generating a 12 words mnemonic phrase
+    // In this example we are generating a 12 word mnemonic phrase
     // but it is also possible generate 15, 18, 21 and 24 words
-    // using their respective `WordCount` variant.
+    // using the respective `WordCount` variant.
     let mnemonic: GeneratedKey<_, Tap> =
         Mnemonic::generate((WordCount::Words12, Language::English))
             .map_err(|_| anyhow!("Mnemonic generation error"))?;
 
     println!("Mnemonic phrase: {}", *mnemonic);
     let mnemonic_with_passphrase = (mnemonic, None);
 
-    // define external and internal derivation key path
+    // Define the external and internal derivation key path.
     let external_path = DerivationPath::from_str("m/86h/1h/0h/0").unwrap();
     let internal_path = DerivationPath::from_str("m/86h/1h/0h/1").unwrap();
 
-    // generate external and internal descriptor from mnemonic
+    // Generate external and internal descriptors from the mnemonic phrase.
     let (external_descriptor, ext_keymap) =
         descriptor!(tr((mnemonic_with_passphrase.clone(), external_path)))?
-            .into_wallet_descriptor(&secp, Network::Testnet)?;
+            .into_wallet_descriptor(&secp, NetworkKind::Test)?;
     let (internal_descriptor, int_keymap) =
         descriptor!(tr((mnemonic_with_passphrase, internal_path)))?
-            .into_wallet_descriptor(&secp, Network::Testnet)?;
+            .into_wallet_descriptor(&secp, NetworkKind::Test)?;
 
     println!("tpub external descriptor: {}", external_descriptor);
     println!("tpub internal descriptor: {}", internal_descriptor);

wallet/examples/policy.rs

@@ -1,7 +1,7 @@
 // Bitcoin Dev Kit
 // Written in 2020 by Alekos Filini <[email protected]>
 //
-// Copyright (c) 2020-2021 Bitcoin Dev Kit Developers
+// Copyright (c) 2020-2025 Bitcoin Dev Kit Developers
 //
 // This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
 // or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -10,11 +10,12 @@
 // licenses.
 
 extern crate bdk_wallet;
+
 use std::error::Error;
 
-use bdk_wallet::bitcoin::Network;
 use bdk_wallet::descriptor::{policy::BuildSatisfaction, ExtractPolicy, IntoWalletDescriptor};
 use bdk_wallet::signer::SignersContainer;
+use bitcoin::NetworkKind;
 
 /// This example describes the use of the BDK's [`bdk_wallet::descriptor::policy`] module.
 ///
@@ -29,18 +30,17 @@ use bdk_wallet::signer::SignersContainer;
 fn main() -> Result<(), Box<dyn Error>> {
     let secp = bitcoin::secp256k1::Secp256k1::new();
 
-    // The descriptor used in the example
-    // The form is "wsh(multi(2, <privkey>, <pubkey>))"
+    // The descriptor used in the example. The form is "wsh(multi(2, <privkey>, <pubkey>))".
     let desc = "wsh(multi(2,tprv8ZgxMBicQKsPdpkqS7Eair4YxjcuuvDPNYmKX3sCniCf16tHEVrjjiSXEkFRnUH77yXc6ZcwHHcLNfjdi5qUvw3VDfgYiH5mNsj5izuiu2N/1/*,tpubD6NzVbkrYhZ4XHndKkuB8FifXm8r5FQHwrN6oZuWCz13qb93rtgKvD4PQsqC4HP4yhV3tA2fqr2RbY5mNXfM7RxXUoeABoDtsFUq2zJq6YK/1/*))";
 
     // Use the descriptor string to derive the full descriptor and a keymap.
     // The wallet descriptor can be used to create a new bdk_wallet::wallet.
     // While the `keymap` can be used to create a `SignerContainer`.
     //
     // The `SignerContainer` can sign for `PSBT`s.
-    // a `bdk_wallet::Wallet` internally uses these to handle transaction signing.
-    // But they can be used as independent tools also.
-    let (wallet_desc, keymap) = desc.into_wallet_descriptor(&secp, Network::Testnet)?;
+    // A `bdk_wallet::Wallet` internally uses these to handle transaction signing, but they can be
+    // used as independent tools as well.
+    let (wallet_desc, keymap) = desc.into_wallet_descriptor(&secp, NetworkKind::Test)?;
 
     println!("Example Descriptor for policy analysis : {}", wallet_desc);
 

wallet/tests/wallet.rs

@@ -27,8 +27,8 @@ use bitcoin::script::PushBytesBuf;
 use bitcoin::sighash::{EcdsaSighashType, TapSighashType};
 use bitcoin::taproot::TapNodeHash;
 use bitcoin::{
-    absolute, transaction, Address, Amount, BlockHash, FeeRate, Network, OutPoint, ScriptBuf,
-    Sequence, Transaction, TxIn, TxOut, Txid, Weight,
+    absolute, transaction, Address, Amount, BlockHash, FeeRate, Network, NetworkKind, OutPoint,
+    ScriptBuf, Sequence, Transaction, TxIn, TxOut, Txid, Weight,
 };
 use bitcoin::{psbt, SignedAmount};
 use miniscript::{descriptor::KeyMap, Descriptor, DescriptorPublicKey};
@@ -69,7 +69,7 @@ fn wallet_is_persisted() -> anyhow::Result<()> {
         let file_path = temp_dir.path().join(filename);
         let (external_desc, internal_desc) = get_test_tr_single_sig_xprv_and_change_desc();
 
-        // create new wallet
+        // Create new wallet.
         let wallet_spk_index = {
             let mut db = create_db(&file_path)?;
             let mut wallet = Wallet::create(external_desc, internal_desc)
@@ -78,12 +78,12 @@ fn wallet_is_persisted() -> anyhow::Result<()> {
                 .create_wallet(&mut db)?;
             wallet.reveal_next_address(KeychainKind::External);
 
-            // persist new wallet changes
+            // Persist new wallet changes.
             assert!(wallet.persist(&mut db)?, "must write");
             wallet.spk_index().clone()
         };
 
-        // recover wallet
+        // Recover wallet.
         {
             let mut db = open_db(&file_path).context("failed to recover db")?;
             let wallet = Wallet::load()
@@ -106,12 +106,12 @@ fn wallet_is_persisted() -> anyhow::Result<()> {
             assert_eq!(
                 *wallet.public_descriptor(KeychainKind::External),
                 external_desc
-                    .into_wallet_descriptor(&secp, wallet.network())
+                    .into_wallet_descriptor(&secp, NetworkKind::from(wallet.network()))
                     .unwrap()
                     .0
             );
         }
-        // Test SPK cache
+        // Test SPK cache.
         {
             let mut db = open_db(&file_path).context("failed to recover db")?;
             let mut wallet = Wallet::load()
@@ -149,7 +149,8 @@ fn wallet_is_persisted() -> anyhow::Result<()> {
             assert_eq!(spk_cache.len(), 1);
             assert_eq!(spk_cache.keys().next(), Some(&25));
         }
-        // SPK cache requires load params
+
+        // SPK cache requires load params.
         {
             let mut db = open_db(&file_path).context("failed to recover db")?;
             let mut wallet = Wallet::load()