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
cli/Cargo.toml
View File

@ -21,6 +21,7 @@ lazy_static = "1.4.0"
log = "0.4.8"
num-traits = "0.2"
pretty-hex = "0.1.1"
reqwest = { version = "0.9.20", default-features = false, features = ["rustls-tls"] }
serde = "1.0.101"
serde_derive = "1.0.101"
serde_json = "1.0.40"
@ -37,7 +38,6 @@ solana-stake-api = { path = "../programs/stake_api", version = "0.20.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.20.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.20.0" }
ureq = "0.11.1"
url = "2.1.0"
[dev-dependencies]

4
cli/src/validator_info.rs
View File

@ -4,6 +4,7 @@ use crate::{
};
use bincode::deserialize;
use clap::ArgMatches;
use reqwest::Client;
use serde_derive::{Deserialize, Serialize};
use serde_json::{Map, Value};
use solana_client::rpc_client::RpcClient;
@ -87,7 +88,8 @@ fn verify_keybase(
"https://keybase.pub/{}/solana/validator-{:?}",
keybase_username, validator_pubkey
);
if ureq::head(&url).call().ok() {
let client = Client::new();
if client.head(&url).send()?.status().is_success() {
Ok(())
} else {
Err(format!("keybase_username could not be confirmed at: {}. Please add this pubkey file to your keybase profile to connect", url))?