Merge #81: Bump bitcoin dependency to ^0.29, minor related fixes

d132572 Bump bitcoin dependency to ^0.29, minor related fixes (Steve Myers)

Pull request description:

  This version bump for `bitcoin` dependency is required to fix bitcoindevkit/bdk#646.

ACKs for top commit:
  afilini:
    ACK d132572

Tree-SHA512: ad89362fa32e386f02ef5721489d2c24b342af8997ceac09933dfc979f70a12b876b4856dd8982942968d8ad82ae34c49386744f51db22c70289a259a195c943

Author: afilini

Cargo.toml

@@ -18,7 +18,7 @@ path = "src/lib.rs"
 
 [dependencies]
 log = "^0.4"
-bitcoin = { version = "^0.28", features = ["use-serde"] }
+bitcoin = { version = "^0.29", features = ["serde"] }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = { version = "^1.0" }
 

src/raw_client.rs

@@ -1214,7 +1214,7 @@ mod test {
             )
             .unwrap();
         assert_eq!(resp.version, 1);
-        assert_eq!(resp.lock_time, 0);
+        assert_eq!(resp.lock_time.to_u32(), 0);
     }
 
     #[test]

src/socks/v5.rs

@@ -553,7 +553,6 @@ impl Socks5Datagram {
 
 #[cfg(test)]
 mod test {
-    use std::error::Error;
     use std::io::{Read, Write};
     use std::net::{TcpStream, ToSocketAddrs, UdpSocket};
 
@@ -745,7 +744,7 @@ mod test {
         .unwrap_err();
 
         assert_eq!(err.kind(), io::ErrorKind::PermissionDenied);
-        assert_eq!(err.description(), "password authentication failed");
+        assert_eq!(err.to_string(), "password authentication failed");
     }
 
     #[test]
@@ -755,7 +754,7 @@ mod test {
         let err = Socks5Stream::connect(SOCKS_PROXY_PASSWD_ONLY, addr, None).unwrap_err();
 
         assert_eq!(err.kind(), io::ErrorKind::Other);
-        assert_eq!(err.description(), "no acceptable auth methods");
+        assert_eq!(err.to_string(), "no acceptable auth methods");
     }
 
     #[test]
@@ -772,7 +771,7 @@ mod test {
         )
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::PermissionDenied);
-        assert_eq!(err.description(), "password authentication failed");
+        assert_eq!(err.to_string(), "password authentication failed");
 
         let err = Socks5Stream::connect_with_password(
             SOCKS_PROXY_PASSWD_ONLY,
@@ -783,7 +782,7 @@ mod test {
         )
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::PermissionDenied);
-        assert_eq!(err.description(), "password authentication failed");
+        assert_eq!(err.to_string(), "password authentication failed");
 
         let err = Socks5Stream::connect_with_password(
             SOCKS_PROXY_PASSWD_ONLY,
@@ -794,7 +793,7 @@ mod test {
         )
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
-        assert_eq!(err.description(), "invalid username");
+        assert_eq!(err.to_string(), "invalid username");
 
         let err = Socks5Stream::connect_with_password(
             SOCKS_PROXY_PASSWD_ONLY,
@@ -805,7 +804,7 @@ mod test {
         )
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
-        assert_eq!(err.description(), "invalid username");
+        assert_eq!(err.to_string(), "invalid username");
 
         let err = Socks5Stream::connect_with_password(
             SOCKS_PROXY_PASSWD_ONLY,
@@ -816,7 +815,7 @@ mod test {
         )
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
-        assert_eq!(err.description(), "invalid password");
+        assert_eq!(err.to_string(), "invalid password");
 
         let err = Socks5Stream::connect_with_password(
             SOCKS_PROXY_PASSWD_ONLY,
@@ -827,7 +826,7 @@ mod test {
         )
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
-        assert_eq!(err.description(), "invalid password");
+        assert_eq!(err.to_string(), "invalid password");
     }
 
     fn string_of_size(size: usize) -> String {