gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert back to reqwest, using rustls feature (#6041)

Browse Source 
* Revert back to reqwest, using rustls feature

* Cargo.lock and crate-features

* Ignore test
This commit is contained in:
Tyera Eulberg
2019-09-24 14:10:59 -06:00
committed by GitHub
parent 571dc4e387
commit 7babfd00c1
19 changed files with 348 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
validator/Cargo.toml
View File

@ -14,6 +14,7 @@ clap = "2.33.0"
console = "0.9.0"
log = "0.4.8"
indicatif = "0.12.0"
reqwest = { version = "0.9.20", default-features = false }
serde_json = "1.0.40"
solana-client = { path = "../client", version = "0.20.0" }
solana-core = { path = "../core", version = "0.20.0" }
@ -27,4 +28,3 @@ solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.20.0" }
tempfile = "3.1.0"
tar = "0.4.26"
ureq = { version = "0.11.1", default-features = false }

22
validator/src/lib.rs
View File

@ -65,19 +65,17 @@ fn download_tar_bz2(
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message(&format!("{}Downloading {}...", TRUCK, url));
let client = ureq::agent();
let response = client.get(url.as_str()).call();
if response.error() {
let error = if let Some(err) = response.synthetic_error().as_ref() {
format!("Unable to get: {:?}", err)
} else {
"Unable to get: unspecified error".to_string()
};
Err(error)?
}
let client = reqwest::Client::new();
let response = client
.get(url.as_str())
.send()
.and_then(|response| response.error_for_status())
.map_err(|err| format!("Unable to get: {:?}", err))?;
let download_size = {
response
.header("Content-Length")
.headers()
.get(reqwest::header::CONTENT_LENGTH)
.and_then(|content_length| content_length.to_str().ok())
.and_then(|content_length| content_length.parse().ok())
.unwrap_or(0)
};
@ -110,7 +108,7 @@ fn download_tar_bz2(
let mut source = DownloadProgress {
progress_bar,
response: response.into_reader(),
response,
};
let mut file = File::create(&temp_archive_path)