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

Transition to ureq http client (#5777)

Browse Source 
* Transition to ureq http client

* Remove unwrap
This commit is contained in:
Tyera Eulberg
2019-09-04 12:11:44 -07:00
committed by GitHub
parent 355640b5db
commit b19d9a50d3
16 changed files with 236 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
programs/btc_spv_bin/Cargo.toml
View File

@ -5,10 +5,11 @@ authors = ["patrick <patrick.solana.com>"]
edition = "2018"
[dependencies]
reqwest="0.9.19"
clap="2.33.0"
serde_derive="1.0.98"
serde="1.0.99"
serde_derive="1.0.98"
serde_json = "1.0.40"
ureq = { version = "0.11.0", features = ["json"] }
[[bin]]
name = "blockheaders"

40
programs/btc_spv_bin/src/blockheade.rs
View File

@ -1,7 +1,6 @@
use clap;
use clap::{App, Arg};
use reqwest;
use serde::Deserialize;
use serde_derive::Deserialize;
// pub type blockHash = [u8; 32];
pub type BlockHeader = [u8; 80];
@ -28,35 +27,24 @@ struct JsonBH {
#[allow(dead_code)]
fn get_header_json(hash: &str) -> JsonBH {
let qs = format!("https://www.blockchain.info/rawblock/{}", hash);
let body = reqwest::get(&qs);
match body {
Err(e) => panic!("rest request failed {}", e),
Ok(mut n) => {
if n.status().is_success() {
let jsonbh: JsonBH = n.json().unwrap();
jsonbh
} else {
panic!("request failed");
}
}
let body = ureq::get(&qs).call();
if body.error() {
panic!("request failed");
} else {
serde_json::from_value(body.into_json().unwrap()).unwrap()
}
}
fn get_header_raw(hash: &str) -> String {
let qs = format!("https://blockchain.info/block/{}?format=hex", hash);
let body = reqwest::get(&qs);
match body {
Err(e) => panic!("rest request failed {}", e),
Ok(mut n) => {
if n.status().is_success() {
let textbh: String = n.text().unwrap();
let hs = &textbh[0..160]; // 160 characters since it's in hex format
let header: String = hs.to_string();
header
} else {
panic!("request failed");
}
}
let body = ureq::get(&qs).call();
if body.error() {
panic!("request failed");
} else {
let textbh: String = body.into_string().unwrap();
let hs = &textbh[0..160]; // 160 characters since it's in hex format
let header: String = hs.to_string();
header
}
}