final ci fixes

Author: Apostlex0

lightning-block-sync/src/convert.rs

@@ -54,7 +54,9 @@ impl From<HttpClientError> for BlockSourceError {
 				}
 			},
 			// Parse errors are persistent (invalid data)
-			HttpClientError::Parse(msg) => BlockSourceError::persistent(HttpClientError::Parse(msg)),
+			HttpClientError::Parse(msg) => {
+				BlockSourceError::persistent(HttpClientError::Parse(msg))
+			},
 		}
 	}
 }
@@ -81,12 +83,14 @@ impl From<RpcClientError> for BlockSourceError {
 						)))
 					}
 				},
-				HttpClientError::Parse(msg) => BlockSourceError::persistent(RpcClientError::Http(
-					HttpClientError::Parse(msg),
-				)),
+				HttpClientError::Parse(msg) => {
+					BlockSourceError::persistent(RpcClientError::Http(HttpClientError::Parse(msg)))
+				},
 			},
 			// RPC errors (e.g. "block not found") are transient
-			RpcClientError::Rpc(rpc_err) => BlockSourceError::transient(RpcClientError::Rpc(rpc_err)),
+			RpcClientError::Rpc(rpc_err) => {
+				BlockSourceError::transient(RpcClientError::Rpc(rpc_err))
+			},
 			// Malformed response data is persistent
 			RpcClientError::InvalidData(msg) => {
 				BlockSourceError::persistent(RpcClientError::InvalidData(msg))
@@ -224,10 +228,7 @@ impl TryInto<(BlockHash, Option<u32>)> for JsonResponse {
 impl TryInto<Txid> for JsonResponse {
 	type Error = String;
 	fn try_into(self) -> Result<Txid, String> {
-		let hex_data = self
-			.0
-			.as_str()
-			.ok_or_else(|| "expected JSON string".to_string())?;
+		let hex_data = self.0.as_str().ok_or_else(|| "expected JSON string".to_string())?;
 		Txid::from_str(hex_data).map_err(|err| err.to_string())
 	}
 }

lightning-block-sync/src/http.rs

@@ -216,9 +216,7 @@ impl TryFrom<Vec<u8>> for JsonResponse {
 	type Error = String;
 
 	fn try_from(bytes: Vec<u8>) -> Result<Self, String> {
-		serde_json::from_slice(&bytes)
-			.map(JsonResponse)
-			.map_err(|e| e.to_string())
+		serde_json::from_slice(&bytes).map(JsonResponse).map_err(|e| e.to_string())
 	}
 }