Skip to content

Commit 3adfbd7

Browse files
committed
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
2 parents ad62e7a + d132572 commit 3adfbd7

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ path = "src/lib.rs"
1818

1919
[dependencies]
2020
log = "^0.4"
21-
bitcoin = { version = "^0.28", features = ["use-serde"] }
21+
bitcoin = { version = "^0.29", features = ["serde"] }
2222
serde = { version = "^1.0", features = ["derive"] }
2323
serde_json = { version = "^1.0" }
2424

Diff for: src/raw_client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ mod test {
12141214
)
12151215
.unwrap();
12161216
assert_eq!(resp.version, 1);
1217-
assert_eq!(resp.lock_time, 0);
1217+
assert_eq!(resp.lock_time.to_u32(), 0);
12181218
}
12191219

12201220
#[test]

Diff for: src/socks/v5.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ impl Socks5Datagram {
553553

554554
#[cfg(test)]
555555
mod test {
556-
use std::error::Error;
557556
use std::io::{Read, Write};
558557
use std::net::{TcpStream, ToSocketAddrs, UdpSocket};
559558

@@ -745,7 +744,7 @@ mod test {
745744
.unwrap_err();
746745

747746
assert_eq!(err.kind(), io::ErrorKind::PermissionDenied);
748-
assert_eq!(err.description(), "password authentication failed");
747+
assert_eq!(err.to_string(), "password authentication failed");
749748
}
750749

751750
#[test]
@@ -755,7 +754,7 @@ mod test {
755754
let err = Socks5Stream::connect(SOCKS_PROXY_PASSWD_ONLY, addr, None).unwrap_err();
756755

757756
assert_eq!(err.kind(), io::ErrorKind::Other);
758-
assert_eq!(err.description(), "no acceptable auth methods");
757+
assert_eq!(err.to_string(), "no acceptable auth methods");
759758
}
760759

761760
#[test]
@@ -772,7 +771,7 @@ mod test {
772771
)
773772
.unwrap_err();
774773
assert_eq!(err.kind(), io::ErrorKind::PermissionDenied);
775-
assert_eq!(err.description(), "password authentication failed");
774+
assert_eq!(err.to_string(), "password authentication failed");
776775

777776
let err = Socks5Stream::connect_with_password(
778777
SOCKS_PROXY_PASSWD_ONLY,
@@ -783,7 +782,7 @@ mod test {
783782
)
784783
.unwrap_err();
785784
assert_eq!(err.kind(), io::ErrorKind::PermissionDenied);
786-
assert_eq!(err.description(), "password authentication failed");
785+
assert_eq!(err.to_string(), "password authentication failed");
787786

788787
let err = Socks5Stream::connect_with_password(
789788
SOCKS_PROXY_PASSWD_ONLY,
@@ -794,7 +793,7 @@ mod test {
794793
)
795794
.unwrap_err();
796795
assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
797-
assert_eq!(err.description(), "invalid username");
796+
assert_eq!(err.to_string(), "invalid username");
798797

799798
let err = Socks5Stream::connect_with_password(
800799
SOCKS_PROXY_PASSWD_ONLY,
@@ -805,7 +804,7 @@ mod test {
805804
)
806805
.unwrap_err();
807806
assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
808-
assert_eq!(err.description(), "invalid username");
807+
assert_eq!(err.to_string(), "invalid username");
809808

810809
let err = Socks5Stream::connect_with_password(
811810
SOCKS_PROXY_PASSWD_ONLY,
@@ -816,7 +815,7 @@ mod test {
816815
)
817816
.unwrap_err();
818817
assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
819-
assert_eq!(err.description(), "invalid password");
818+
assert_eq!(err.to_string(), "invalid password");
820819

821820
let err = Socks5Stream::connect_with_password(
822821
SOCKS_PROXY_PASSWD_ONLY,
@@ -827,7 +826,7 @@ mod test {
827826
)
828827
.unwrap_err();
829828
assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
830-
assert_eq!(err.description(), "invalid password");
829+
assert_eq!(err.to_string(), "invalid password");
831830
}
832831

833832
fn string_of_size(size: usize) -> String {

0 commit comments

Comments
 (0)