X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Frpc.rs;h=88199688aefd1a48fd128aac5c45f319f947c90e;hb=c9ce344d56991ffa49c1867d5041bc136cedbece;hp=66570bcb57c032353ab0d6a2f500bcda91740381;hpb=4f880c6b75e6b02072fa5dd37ee475538533393a;p=rust-lightning

diff --git a/lightning-block-sync/src/rpc.rs b/lightning-block-sync/src/rpc.rs
index 66570bcb..88199688 100644
--- a/lightning-block-sync/src/rpc.rs
+++ b/lightning-block-sync/src/rpc.rs
@@ -2,7 +2,7 @@
 //! endpoint.
 
 use crate::{BlockHeaderData, BlockSource, AsyncBlockSourceResult};
-use crate::http::{HttpClient, HttpEndpoint, JsonResponse};
+use crate::http::{HttpClient, HttpEndpoint, HttpError, JsonResponse};
 
 use bitcoin::blockdata::block::Block;
 use bitcoin::hash_types::BlockHash;
@@ -47,8 +47,20 @@ impl RpcClient {
 			"id": &self.id.fetch_add(1, Ordering::AcqRel).to_string()
 		});
 
-		let mut response = self.client.post::<JsonResponse>(&uri, &host, &self.basic_auth, content)
-			.await?.0;
+		let mut response = match self.client.post::<JsonResponse>(&uri, &host, &self.basic_auth, content).await {
+			Ok(JsonResponse(response)) => response,
+			Err(e) if e.kind() == std::io::ErrorKind::Other => {
+				match e.get_ref().unwrap().downcast_ref::<HttpError>() {
+					Some(http_error) => match JsonResponse::try_from(http_error.contents.clone()) {
+						Ok(JsonResponse(response)) => response,
+						Err(_) => Err(e)?,
+					},
+					None => Err(e)?,
+				}
+			},
+			Err(e) => Err(e)?,
+		};
+
 		if !response.is_object() {
 			return Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "expected JSON object"));
 		}
@@ -143,7 +155,7 @@ mod tests {
 		let response = serde_json::json!({
 			"error": { "code": -8, "message": "invalid parameter" },
 		});
-		let server = HttpServer::responding_with_ok(MessageBody::Content(response));
+		let server = HttpServer::responding_with_server_error(response);
 		let mut client = RpcClient::new(CREDENTIALS, server.endpoint()).unwrap();
 
 		let invalid_block_hash = serde_json::json!("foo");