Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afilini merged 1 commit into from
Sep 5, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion src/raw_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
17 changes: 8 additions & 9 deletions src/socks/v5.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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 {
Expand Down