Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-02-01 08:51:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

change hyper-socks2-mw to versioned crate (#425)

Browse source
This commit is contained in:
Yeastplume 2020-06-03 14:31:19 +01:00 committed by GitHub
parent 60ab3728ab
commit 3edd410e19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -1487,7 +1487,7 @@ dependencies = [
"http 0.1.21", "http 0.1.21",
"hyper", "hyper",
"hyper-rustls 0.19.1", "hyper-rustls 0.19.1",
"hyper-socks2", "hyper-socks2-mw",
"hyper-timeout", "hyper-timeout",
"log", "log",
"rand 0.5.6", "rand 0.5.6",
@ -1728,9 +1728,10 @@ dependencies = [
] ]
[[package]] [[package]]
name = "hyper-socks2" name = "hyper-socks2-mw"
version = "0.4.3" version = "0.4.4"
source = "git+https://github.com/yeastplume/hyper-socks2#08c3e5f6e8fb642110abe61e8a381195ac60cb6c" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7267805b50714db2ebe2904b1e70158ba6ba8eafdaf7c9d7735aca3273c4f8"
dependencies = [ dependencies = [
"async-socks5", "async-socks5",
"futures 0.3.5", "futures 0.3.5",

3
impls/Cargo.toml
View file

@ -33,8 +33,7 @@ hyper-timeout = "0.3"
#Socks/Tor #Socks/Tor
byteorder = "1" byteorder = "1"
hyper = "0.13" hyper = "0.13"
#hyper-socks2 = "0.4" hyper-socks2-mw = "0.4"
hyper-socks2 = { git = "https://github.com/yeastplume/hyper-socks2", branch = "master" }
ed25519-dalek = "1.0.0-pre.1" ed25519-dalek = "1.0.0-pre.1"
x25519-dalek = "0.6" x25519-dalek = "0.6"
data-encoding = "2" data-encoding = "2"

2
impls/src/client_utils/client.rs
View file

@ -292,7 +292,7 @@ impl Client {
let auth = format!("{}:{}", addr.ip(), addr.port()); let auth = format!("{}:{}", addr.ip(), addr.port());
let https = hyper_rustls::HttpsConnector::new(); let https = hyper_rustls::HttpsConnector::new();
let socks = hyper_socks2::SocksConnector { let socks = hyper_socks2_mw::SocksConnector {
proxy_addr: hyper::Uri::builder() proxy_addr: hyper::Uri::builder()
.scheme("socks5") .scheme("socks5")
.authority(auth.as_str()) .authority(auth.as_str())