diff --git a/src/client.rs b/src/client.rs index 1ed336b..7e4e626 100644 --- a/src/client.rs +++ b/src/client.rs @@ -448,7 +448,9 @@ mod tests { let now = Instant::now(); let client = Client::from_config( &endpoint, - crate::config::ConfigBuilder::new().timeout(Some(5)).build(), + crate::config::ConfigBuilder::new() + .timeout(Some(Duration::from_secs(5))) + .build(), ); let elapsed = now.elapsed(); diff --git a/src/config.rs b/src/config.rs index 47da1f9..e4c5770 100644 --- a/src/config.rs +++ b/src/config.rs @@ -55,8 +55,8 @@ impl ConfigBuilder { } /// Sets the timeout - pub fn timeout(mut self, timeout: Option) -> Self { - self.config.timeout = timeout.map(|t| Duration::from_secs(t as u64)); + pub fn timeout(mut self, timeout: Option) -> Self { + self.config.timeout = timeout; self } diff --git a/src/raw_client.rs b/src/raw_client.rs index 8cb12e2..54d75f8 100644 --- a/src/raw_client.rs +++ b/src/raw_client.rs @@ -1249,7 +1249,7 @@ mod test { let client = RawClient::new(get_test_server(), None).unwrap(); let resp = client.relay_fee().unwrap(); - assert_eq!(resp, 0.00001); + assert_eq!(resp, 0.000001); } #[test] diff --git a/src/socks/v4.rs b/src/socks/v4.rs index 9d0fc3f..b4e999d 100644 --- a/src/socks/v4.rs +++ b/src/socks/v4.rs @@ -18,12 +18,7 @@ fn read_response(socket: &mut TcpStream) -> io::Result { match response.read_u8()? { 90 => {} - 91 => { - return Err(io::Error::new( - io::ErrorKind::Other, - "request rejected or failed", - )) - } + 91 => return Err(io::Error::other("request rejected or failed")), 92 => { return Err(io::Error::new( io::ErrorKind::PermissionDenied, diff --git a/src/socks/v5.rs b/src/socks/v5.rs index 7a602d2..6b06e8f 100644 --- a/src/socks/v5.rs +++ b/src/socks/v5.rs @@ -37,10 +37,7 @@ fn read_addr(socket: &mut R) -> io::Result { ip, port, 0, 0, )))) } - _ => Err(io::Error::new( - io::ErrorKind::Other, - "unsupported address type", - )), + _ => Err(io::Error::other("unsupported address type")), } } @@ -54,35 +51,15 @@ fn read_response(socket: &mut TcpStream) -> io::Result { match socket.read_u8()? { 0 => {} - 1 => { - return Err(io::Error::new( - io::ErrorKind::Other, - "general SOCKS server failure", - )) - } - 2 => { - return Err(io::Error::new( - io::ErrorKind::Other, - "connection not allowed by ruleset", - )) - } - 3 => return Err(io::Error::new(io::ErrorKind::Other, "network unreachable")), - 4 => return Err(io::Error::new(io::ErrorKind::Other, "host unreachable")), - 5 => return Err(io::Error::new(io::ErrorKind::Other, "connection refused")), - 6 => return Err(io::Error::new(io::ErrorKind::Other, "TTL expired")), - 7 => { - return Err(io::Error::new( - io::ErrorKind::Other, - "command not supported", - )) - } - 8 => { - return Err(io::Error::new( - io::ErrorKind::Other, - "address kind not supported", - )) - } - _ => return Err(io::Error::new(io::ErrorKind::Other, "unknown error")), + 1 => return Err(io::Error::other("general SOCKS server failure")), + 2 => return Err(io::Error::other("connection not allowed by ruleset")), + 3 => return Err(io::Error::other("network unreachable")), + 4 => return Err(io::Error::other("host unreachable")), + 5 => return Err(io::Error::other("connection refused")), + 6 => return Err(io::Error::other("TTL expired")), + 7 => return Err(io::Error::other("command not supported")), + 8 => return Err(io::Error::other("address kind not supported")), + _ => return Err(io::Error::other("unknown error")), } if socket.read_u8()? != 0 { @@ -227,14 +204,11 @@ impl Socks5Stream { } if selected_method == 0xff { - return Err(io::Error::new( - io::ErrorKind::Other, - "no acceptable auth methods", - )); + return Err(io::Error::other("no acceptable auth methods")); } if selected_method != auth.id() && selected_method != Authentication::None.id() { - return Err(io::Error::new(io::ErrorKind::Other, "unknown auth method")); + return Err(io::Error::other("unknown auth method")); } match *auth { diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..fb35b4c --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +verify test diff --git a/verify.txt b/verify.txt new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/verify.txt @@ -0,0 +1 @@ +test