Merge pull request #852 from peterjoel/price_info_refactor

reorganised price info lookup

parity/price_info.rs

@@ -11,29 +11,19 @@ pub struct PriceInfo {
 impl PriceInfo {
 	pub fn get() -> Option<PriceInfo> {
 		let mut body = String::new();
-		// TODO: actually bother dicking around with the errors and make it proper.
-		match match match Client::new()
+		// TODO: Handle each error type properly
+		Client::new()
 			.get("http://api.etherscan.io/api?module=stats&action=ethprice")
 			.header(Connection::close())
-			.send() {
-			Err(_) => { return None; },
-			Ok(mut s) => s.read_to_string(&mut body),
-		} {
-			Err(_) => { return None; },
-			_ => { Json::from_str(&body) }
-		} {
-			Err(_) => { return None; },
-			Ok(json) => {
-				let ethusd: f32 = if let Some(&Json::String(ref s)) = json.find_path(&["result", "ethusd"]) {
-					FromStr::from_str(&s).unwrap()
-				} else {
-					return None;
-				};
-				Some(PriceInfo {
-					ethusd: ethusd,
-				})
-			}
-		}
+			.send().ok()
+			.and_then(|mut s| s.read_to_string(&mut body).ok())
+			.and_then(|_| Json::from_str(&body).ok())
+			.and_then(|json| json.find_path(&["result", "ethusd"])
+				.and_then(|obj| match obj {
+					&Json::String(ref s) => Some(PriceInfo {
+						ethusd: FromStr::from_str(&s).unwrap()
+					}),
+					_ => None
+				}))
 	}
 }
-