f clean up huge match

Author: TheBlueMatt

lightning-block-sync/src/convert.rs

@@ -270,24 +270,18 @@ impl TryInto<GetUtxosResponse> for JsonResponse {
 	type Error = std::io::Error;
 
 	fn try_into(self) -> std::io::Result<GetUtxosResponse> {
-		match self.0.as_object() {
-			None => Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "expected an object")),
-			Some(obj) => match obj.get("bitmap") {
-				None => Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "missing bitmap field")),
-				Some(bitmap) => match bitmap.as_str() {
-					None => Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "bitmap should be an str")),
-					Some(bitmap_str) => {
-						let mut hit_bitmap_nonempty = false;
-						for c in bitmap_str.chars() {
-							if c < '0' || c > '9' {
-								return Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "invalid byte"));
-							}
-							if c > '0' { hit_bitmap_nonempty = true; }
-						}
-						Ok(GetUtxosResponse { hit_bitmap_nonempty })
-					}
+		let bitmap_str =
+			self.0.as_object().ok_or(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "expected an object")))?
+			.get("bitmap").ok_or(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "missing bitmap field")))?
+			.as_str().ok_or(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "bitmap should be an str")))?;
+			let mut hit_bitmap_nonempty = false;
+			for c in bitmap_str.chars() {
+				if c < '0' || c > '9' {
+					return Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "invalid byte"));
 				}
+				if c > '0' { hit_bitmap_nonempty = true; }
 			}
+			Ok(GetUtxosResponse { hit_bitmap_nonempty })
 		}
 	}
 }