Change from_str(s) to parse::<T>() in Examples

`s.parse` is more idiomatic and produces more helpful error messages.

This has been changed in examples.

bitcoin/examples/ecdsa-psbt-simple.rs

@@ -184,13 +184,13 @@ fn main() {
     // information to the PSBT.
     let ty = EcdsaSighashType::All.into();
     let derivation_paths = [
-        DerivationPath::from_str("m/84'/0'/0'/0/0").expect("valid derivation path"),
+        "m/84'/0'/0'/0/0".parse::<DerivationPath>().expect("valid derivation path"),
-        DerivationPath::from_str("m/84'/0'/0'/1/0").expect("valid derivation path"),
+        "m/84'/0'/0'/1/0".parse::<DerivationPath>().expect("valid derivation path"),
     ];
     let mut bip32_derivations = Vec::new();
     for (idx, pk) in pk_inputs.iter().enumerate() {
         let mut map = BTreeMap::new();
-        let fingerprint = Fingerprint::from_str(MASTER_FINGERPRINT).expect("valid fingerprint");
+        let fingerprint = MASTER_FINGERPRINT.parse::<Fingerprint>().expect("valid fingerprint");
         map.insert(pk.0, (fingerprint, derivation_paths[idx].clone()));
         bip32_derivations.push(map);
     }

bitcoin/examples/ecdsa-psbt.rs

@@ -112,7 +112,7 @@ impl ColdStorage {
     ///
     /// The newly created signer along with the data needed to configure a watch-only wallet.
     fn new<C: Signing>(secp: &Secp256k1<C>, xpriv: &str) -> Result<ExportData> {
-        let master_xpriv = Xpriv::from_str(xpriv)?;
+        let master_xpriv = xpriv.parse::<Xpriv>()?;
         let master_xpub = Xpub::from_priv(secp, &master_xpriv);
 
         // Hardened children require secret data to derive.
@@ -176,10 +176,10 @@ impl WatchOnly {
     /// Creates the PSBT, in BIP174 parlance this is the 'Creator'.
     fn create_psbt<C: Verification>(&self, secp: &Secp256k1<C>) -> Result<Psbt> {
         let to_address = Address::from_str(RECEIVE_ADDRESS)?.require_network(Network::Regtest)?;
-        let to_amount = Amount::from_str(OUTPUT_AMOUNT_BTC)?;
+        let to_amount = OUTPUT_AMOUNT_BTC.parse::<Amount>()?;
 
         let (_, change_address, _) = self.change_address(secp)?;
-        let change_amount = Amount::from_str(CHANGE_AMOUNT_BTC)?;
+        let change_amount = CHANGE_AMOUNT_BTC.parse::<Amount>()?;
 
         let tx = Transaction {
             version: transaction::Version::TWO,
@@ -217,7 +217,7 @@ impl WatchOnly {
         map.insert(pk.0, (fingerprint, path));
         input.bip32_derivation = map;
 
-        let ty = PsbtSighashType::from_str("SIGHASH_ALL")?;
+        let ty = "SIGHASH_ALL".parse::<PsbtSighashType>()?;
         input.sighash_type = Some(ty);
 
         psbt.inputs = vec![input];
@@ -276,7 +276,7 @@ fn input_derivation_path() -> Result<DerivationPath> {
 fn previous_output() -> TxOut {
     let script_pubkey = ScriptBuf::from_hex(INPUT_UTXO_SCRIPT_PUBKEY)
         .expect("failed to parse input utxo scriptPubkey");
-    let amount = Amount::from_str(INPUT_UTXO_VALUE).expect("failed to parse input utxo value");
+    let amount = INPUT_UTXO_VALUE.parse::<Amount>().expect("failed to parse input utxo value");
 
     TxOut { value: amount, script_pubkey }
 }

bitcoin/examples/taproot-psbt-simple.rs

@@ -151,13 +151,13 @@ fn main() {
     // Map of tap root X-only keys to origin info and leaf hashes contained in it.
     let origin_input_1 = get_tap_key_origin(
         pk_input_1,
-        Fingerprint::from_str(MASTER_FINGERPRINT).unwrap(),
+        MASTER_FINGERPRINT.parse::<Fingerprint>().unwrap(),
-        DerivationPath::from_str("m/86'/0'/0'/0/0").unwrap(),
+        "m/86'/0'/0'/0/0".parse::<DerivationPath>().unwrap(),
     );
     let origin_input_2 = get_tap_key_origin(
         pk_input_2,
-        Fingerprint::from_str(MASTER_FINGERPRINT).unwrap(),
+        MASTER_FINGERPRINT.parse::<Fingerprint>().unwrap(),
-        DerivationPath::from_str("m/86'/0'/0'/1/0").unwrap(),
+        "m/86'/0'/0'/1/0".parse::<DerivationPath>().unwrap(),
     );
     let origins = [origin_input_1, origin_input_2];
 

bitcoin/examples/taproot-psbt.rs

@@ -116,7 +116,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let tx_hex_string = encode::serialize_hex(&generate_bip86_key_spend_tx(
         &secp,
         // The master extended private key from the descriptor in step 4
-        Xpriv::from_str(BENEFACTOR_XPRIV_STR)?,
+        BENEFACTOR_XPRIV_STR.parse::<Xpriv>()?,
         // Set these fields with valid data for the UTXO from step 5 above
         UTXO_1,
         vec![
@@ -135,10 +135,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("START EXAMPLE 2 - Script path spending of inheritance UTXO\n");
 
     {
-        let beneficiary = BeneficiaryWallet::new(Xpriv::from_str(BENEFICIARY_XPRIV_STR)?)?;
+        let beneficiary = BeneficiaryWallet::new(BENEFICIARY_XPRIV_STR.parse::<Xpriv>()?)?;
 
         let mut benefactor = BenefactorWallet::new(
-            Xpriv::from_str(BENEFACTOR_XPRIV_STR)?,
+            BENEFACTOR_XPRIV_STR.parse::<Xpriv>()?,
             beneficiary.master_xpub(),
         )?;
         let (tx, psbt) = benefactor.create_inheritance_funding_tx(
@@ -173,10 +173,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("START EXAMPLE 3 - Key path spending of inheritance UTXO\n");
 
     {
-        let beneficiary = BeneficiaryWallet::new(Xpriv::from_str(BENEFICIARY_XPRIV_STR)?)?;
+        let beneficiary = BeneficiaryWallet::new(BENEFICIARY_XPRIV_STR.parse::<Xpriv>()?)?;
 
         let mut benefactor = BenefactorWallet::new(
-            Xpriv::from_str(BENEFACTOR_XPRIV_STR)?,
+            BENEFACTOR_XPRIV_STR.parse::<Xpriv>()?,
             beneficiary.master_xpub(),
         )?;
         let (tx, _) = benefactor.create_inheritance_funding_tx(
@@ -227,7 +227,7 @@ fn generate_bip86_key_spend_tx(
     outputs: Vec<TxOut>,
 ) -> Result<Transaction, Box<dyn std::error::Error>> {
     let from_amount = input_utxo.amount_in_sats;
-    let input_pubkey = XOnlyPublicKey::from_str(input_utxo.pubkey)?;
+    let input_pubkey = input_utxo.pubkey.parse::<XOnlyPublicKey>()?;
 
     // CREATOR + UPDATER
     let tx1 = Transaction {
@@ -249,8 +249,8 @@ fn generate_bip86_key_spend_tx(
         (
             vec![],
             (
-                Fingerprint::from_str(input_utxo.master_fingerprint)?,
+                input_utxo.master_fingerprint.parse::<Fingerprint>()?,
-                DerivationPath::from_str(input_utxo.derivation_path)?,
+                input_utxo.derivation_path.parse::<DerivationPath>()?,
             ),
         ),
     );
@@ -264,7 +264,7 @@ fn generate_bip86_key_spend_tx(
         tap_key_origins: origins,
         ..Default::default()
     };
-    let ty = PsbtSighashType::from_str("SIGHASH_ALL")?;
+    let ty = "SIGHASH_ALL".parse::<PsbtSighashType>()?;
     input.sighash_type = Some(ty);
     input.tap_internal_key = Some(input_pubkey);
     psbt.inputs = vec![input];
@@ -391,7 +391,7 @@ impl BenefactorWallet {
         }
         // We use some other derivation path in this example for our inheritance protocol. The important thing is to ensure
         // that we use an unhardened path so we can make use of xpubs.
-        let derivation_path = DerivationPath::from_str(&format!("101/1/0/0/{}", self.next))?;
+        let derivation_path = format!("101/1/0/0/{}", self.next).parse::<DerivationPath>()?;
         let internal_keypair =
             self.master_xpriv.derive_priv(&self.secp, &derivation_path).to_keypair(&self.secp);
         let beneficiary_key =
@@ -443,7 +443,7 @@ impl BenefactorWallet {
             internal_keypair.x_only_public_key().0,
             (vec![], (self.master_xpriv.fingerprint(&self.secp), derivation_path)),
         );
-        let ty = PsbtSighashType::from_str("SIGHASH_ALL")?;
+        let ty = "SIGHASH_ALL".parse::<PsbtSighashType>()?;
         let mut tap_scripts = BTreeMap::new();
         tap_scripts.insert(
             taproot_spend_info.control_block(&(script.clone(), LeafVersion::TapScript)).unwrap(),
@@ -480,7 +480,7 @@ impl BenefactorWallet {
             // We use some other derivation path in this example for our inheritance protocol. The important thing is to ensure
             // that we use an unhardened path so we can make use of xpubs.
             let new_derivation_path =
-                DerivationPath::from_str(&format!("101/1/0/0/{}", self.next))?;
+                format!("101/1/0/0/{}", self.next).parse::<DerivationPath>()?;
             let new_internal_keypair = self
                 .master_xpriv
                 .derive_priv(&self.secp, &new_derivation_path)
@@ -582,7 +582,7 @@ impl BenefactorWallet {
                 beneficiary_key,
                 (vec![leaf_hash], (self.beneficiary_xpub.fingerprint(), new_derivation_path)),
             );
-            let ty = PsbtSighashType::from_str("SIGHASH_ALL")?;
+            let ty = "SIGHASH_ALL".parse::<PsbtSighashType>()?;
             let mut tap_scripts = BTreeMap::new();
             tap_scripts.insert(
                 taproot_spend_info