Made HTTP errors in get requests return Err

As opposed to being Ok and then choking on parsing the returned JSON.

Author: icefoxen

src/ipns.rs

@@ -23,7 +23,7 @@ impl IpfsApi {
     /// ```
     pub fn name_resolve(&self, name: &str) -> Result<String> {
         let url = format!("http://{}:{}/api/v0/name/resolve?arg={}", self.server, self.port, name);
-        let resp = reqwest::get(&url)?;
+        let resp = reqwest::get(&url)?.error_for_status()?;
         let resp: Value = serde_json::from_reader(resp)?;
 
         if resp["Path"].is_string() {
@@ -36,7 +36,7 @@ impl IpfsApi {
     /// Publish an IPFS hash in IPNS.
     pub fn name_publish(&self, hash: &str) -> Result<()> {
         let url = format!("http://{}:{}/api/v0/name/publish?arg={}", self.server, self.port, hash);
-        let _resp = reqwest::get(&url)?;
+        let _resp = reqwest::get(&url)?.error_for_status()?;
         Ok(())
     }
 }

src/object.rs

@@ -26,7 +26,7 @@ impl IpfsApi {
     /// of a hash.
     pub fn object_stats(&self, hash: &str) -> Result<ObjectStats> {
         let url = format!("http://{}:{}/api/v0/object/stat?arg={}", self.server, self.port, hash);
-        let resp = reqwest::get(&url)?;
+        let resp = reqwest::get(&url)?.error_for_status()?;
         Ok(serde_json::from_reader(resp)?)
     }
 }

src/pin.rs

@@ -51,7 +51,7 @@ impl IpfsApi {
             .append_pair("arg", hash)
             .append_pair("recursive", &recursive.to_string())
             .append_pair("progress", &progress.to_string());
-        let resp = reqwest::get(url)?;
+        let resp = reqwest::get(url)?.error_for_status()?;
         Ok(serde_json::from_reader(resp)?)
     }
 
@@ -62,7 +62,7 @@ impl IpfsApi {
         url.query_pairs_mut()
             .append_pair("arg", hash)
             .append_pair("recursive", &recursive.to_string());
-        let resp = reqwest::get(url)?;
+        let resp = reqwest::get(url)?.error_for_status()?;
         Ok(serde_json::from_reader(resp)?)
     }
 
@@ -71,10 +71,7 @@ impl IpfsApi {
     pub fn pin_ls(&self) -> Result<PinList> {
         let mut url = self.get_url()?;
         url.set_path("api/v0/pin/ls");
-        // url.query_pairs_mut()
-        //     .append_pair("arg", hash);
-        //     .append_pair("recursive", &recursive.to_string());
-        let resp = reqwest::get(url)?;
+        let resp = reqwest::get(url)?.error_for_status()?;
         Ok(serde_json::from_reader(resp)?)
     }
 }
@@ -105,16 +102,14 @@ mod tests {
 
         // Add pin
         let api = IpfsApi::new("127.0.0.1", 5001);
-        let resp = api.pin_add(obj, true, true);
-        // println!("Add response: {:#?}", resp);
+        let resp = api.pin_add(obj, true, false);
+        println!("Add response: {:#?}", resp);
         let desired = PinAddResponse {
             pins: vec![obj.into()],
             progress: None,
         };
         assert_eq!(resp.unwrap(), desired);
 
-
-
         // List pin to make sure it's present.
         let api = IpfsApi::new("127.0.0.1", 5001);
         let resp = api.pin_ls();

src/pubsub.rs

@@ -56,7 +56,7 @@ impl IpfsApi {
     /// ```
     pub fn pubsub_subscribe(&self, channel: &str) -> Result<impl Iterator<Item=PubSubMessage>> {
         let url = format!("http://{}:{}/api/v0/pubsub/sub?arg={}&discover=true", self.server, self.port, channel);
-        let resp = reqwest::get(&url)?;
+        let resp = reqwest::get(&url)?.error_for_status()?;
 
         let messages = BufReader::new(resp).lines()
             .filter(|x|x.is_ok())
@@ -80,7 +80,7 @@ impl IpfsApi {
     /// for peer-to-peer communication and dynamic apps over IPFS.
     pub fn pubsub_publish(&self, channel: &str, data: &str) -> Result<()> {
         let url = format!("http://{}:{}/api/v0/pubsub/pub?arg={}&arg={}", self.server, self.port, channel, data);
-        let _resp = reqwest::get(&url)?;
+        let _resp = reqwest::get(&url)?.error_for_status()?;
         Ok(())
     }
 }

src/version.rs

@@ -24,7 +24,7 @@ impl IpfsApi {
     /// Get the version from the IPFS daemon.
     pub fn version(&self) -> Result<IpfsVersion> {
         let url = format!("http://{}:{}/api/v0/version", self.server, self.port);
-        let resp = reqwest::get(&url)?;
+        let resp = reqwest::get(&url)?.error_for_status()?;
         Ok(serde_json::from_reader(resp)?)
     }
 }