Upgrade bitcoin to 0.32

InvalidNetworkError no longer reports address.network() since
that method was removed.

Cargo.toml

@@ -23,7 +23,7 @@ non-compliant-bytes = ["either"]
 [dependencies]
 either = { version = "1.6.1", optional = true }
 percent-encoding-rfc3986 = "0.1.3"
-bitcoin = { version = "0.31.0", default-features = false }
+bitcoin = { version = "0.32.0", default-features = false }
 
 [dev-dependencies]
-bitcoin = { version = "0.31.0", features = ["std"] }
+bitcoin = { version = "0.32.0", features = ["std"] }

src/lib.rs

@@ -136,15 +136,14 @@ impl<'a, NetVal: NetworkValidation, T> Uri<'a, NetVal, T> {
 
 impl<'a, T> Uri<'a, bitcoin::address::NetworkUnchecked, T> {
     /// Checks that the bitcoin network in the URI is `network`.
-    pub fn require_network(self, network: bitcoin::Network) -> Result<Uri<'a, bitcoin::address::NetworkChecked, T>, InvalidNetworkError> {
-        if self.address.is_valid_for_network(network) {
-            Ok(self.assume_checked())
-        } else {
-            Err(InvalidNetworkError {
-                required: network,
-                found: *self.address.network(),
-            })
-        }
+    pub fn require_network(self, network: bitcoin::Network) -> Result<Uri<'a, bitcoin::address::NetworkChecked, T>, bitcoin::address::ParseError> {
+        Ok(Uri {
+            address: self.address.require_network(network)?,
+            amount: self.amount,
+            label: self.label,
+            message: self.message,
+            extras: self.extras,
+        })
     }
 
     /// Marks URI validated without checks.
@@ -159,13 +158,6 @@ impl<'a, T> Uri<'a, bitcoin::address::NetworkUnchecked, T> {
     }
 }
 
-/// An error returned when network validation fails.
-#[derive(Debug, Clone)]
-pub struct InvalidNetworkError {
-    required: bitcoin::Network,
-    found: bitcoin::Network,
-}
-
 /// Abstracted stringly parameter in the URI.
 ///
 /// This type abstracts the parameter that may be encoded allowing lazy decoding, possibly even