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

* Revert back to reqwest, using rustls feature

* Cargo.lock and crate-features

* Ignore test

programs/btc_spv_bin/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2018"
 
 [dependencies]
 clap="2.33.0"
+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"
-ureq = { version = "0.11.1", features = ["json"] }
 hex = "0.3.2"
 
 [[bin]]

programs/btc_spv_bin/src/block.rs

@@ -1,17 +1,22 @@
 use clap;
 use clap::{App, Arg};
 use hex;
+use reqwest;
 use std::fs::File;
 use std::io::prelude::*;
 
 fn get_block_raw(hash: &str) -> String {
     let qs = format!("https://blockchain.info/block/{}?format=hex", hash);
-    let body = ureq::get(&qs).call();
-    if body.error() {
-        panic!("request failed");
-    } else {
-        let textbh: String = body.into_string().unwrap();
-        textbh
+    let body = reqwest::get(&qs);
+    match body {
+        Err(e) => panic!("rest request failed {}", e),
+        Ok(mut n) => {
+            if n.status().is_success() {
+                n.text().unwrap()
+            } else {
+                panic!("request failed");
+            }
+        }
     }
 }
 

programs/btc_spv_bin/src/blockheade.rs

@@ -1,5 +1,6 @@
 use clap;
 use clap::{App, Arg};
+use reqwest;
 use serde_derive::Deserialize;
 
 // pub type blockHash = [u8; 32];
@@ -27,24 +28,35 @@ struct JsonBH {
 #[allow(dead_code)]
 fn get_header_json(hash: &str) -> JsonBH {
     let qs = format!("https://www.blockchain.info/rawblock/{}", hash);
-    let body = ureq::get(&qs).call();
-    if body.error() {
-        panic!("request failed");
-    } else {
-        serde_json::from_value(body.into_json().unwrap()).unwrap()
+    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");
+            }
+        }
     }
 }
 
 fn get_header_raw(hash: &str) -> String {
     let qs = format!("https://blockchain.info/block/{}?format=hex", hash);
-    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
+    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");
+            }
+        }
     }
 }