Merge #13: Do not manually map numeric error

93af3a8 Do not manually map numeric error (Tobin C. Harding)

Pull request description:

  We provide `From` impls for all errors that include a `NumericError` - use it.

ACKs for top commit:
  apoelstra:
    ACK 93af3a8; successfully ran local tests

Tree-SHA512: 235829c69a2f4390f42171062d3f7bf1d49f9b293bc83aff95523060fb1329c6bc8309b67792ea9039d6146c02f73133c396f8e589d4c72f99aa65a07e798544

Author: apoelstra

types/src/v17/wallet/into.rs

@@ -159,11 +159,8 @@ impl GetAddressInfo {
                     .map_err(E::Pubkeys)
             })
             .transpose()?;
-        let sigs_required = self
-            .sigs_required
-            .map(|s| crate::to_u32(s, "sigs_required"))
-            .transpose()
-            .map_err(E::Numeric)?;
+        let sigs_required =
+            self.sigs_required.map(|s| crate::to_u32(s, "sigs_required")).transpose()?;
         let pubkey = self.pubkey.map(|s| s.parse::<PublicKey>()).transpose().map_err(E::Pubkey)?;
         let embedded =
             self.embedded.map(|embedded| embedded.into_model()).transpose().map_err(E::Embedded)?;
@@ -254,11 +251,8 @@ impl GetAddressInfoEmbedded {
             .map(|s| s.parse::<PublicKey>())
             .collect::<Result<Vec<_>, _>>()
             .map_err(E::Pubkeys)?;
-        let sigs_required = self
-            .sigs_required
-            .map(|s| crate::to_u32(s, "sigs_required"))
-            .transpose()
-            .map_err(E::Numeric)?;
+        let sigs_required =
+            self.sigs_required.map(|s| crate::to_u32(s, "sigs_required")).transpose()?;
         let pubkey = self.pubkey.map(|s| s.parse::<PublicKey>()).transpose().map_err(E::Pubkey)?;
         let labels = self.labels.into_iter().map(|label| label.into_model()).collect();