Simplifies logic and gets rid of errors

Errors are not returned as JSON encoded (as I assumed), but raised as std::io::Error by rpc.callmethod. Therefore the logic for parsing errors is unnecessary here.

Author: sr-gi

lightning-block-sync/src/convert.rs

@@ -192,42 +192,31 @@ impl TryInto<Transaction> for JsonResponse {
 					// result may or may not be signed (e.g. signrawtransactionwithwallet)
 					serde_json::Value::Bool(x) => {
 						if x == false {
+							let reason = match &self.0["errors"][0]["error"] {
+								serde_json::Value::String(x) => x.as_str(),
+								_ => "Unknown error",
+							};
+
 							return Err(std::io::Error::new(
 								std::io::ErrorKind::InvalidData,
-								"transaction couldn't be signed",
+								format!("transaction couldn't be signed. {}", reason),
 							));
 						} else {
 							hex_data
 						}
 					}
-					// result if a complete transaction (e.g. getrawtranaction)
+					// result is a complete transaction (e.g. getrawtranaction verbose)
 					_ => hex_data,
 				},
-
-				// result is an error
-				_ => match &self.0["error"] {
-					serde_json::Value::String(error_data) => {
-						return Err(std::io::Error::new(
-							std::io::ErrorKind::InvalidData,
-							format!(
-								"trying to construct the transaction returned an error: {}",
-								error_data
-							),
-						))
-					}
-					_ => {
-						return Err(std::io::Error::new(
+				_ => return Err(std::io::Error::new(
 							std::io::ErrorKind::InvalidData,
-							"no hex nor error fields in the provided JSON object",
-						))
-					}
-				},
+							"expected JSON string",
+					)),
 			}
 		} else {
-			// result is plain text
+			// result is plain text (e.g. getrawtransaction no verbose)
 			match self.0.as_str() {
 				Some(hex_tx) => hex_tx,
-
 				None => {
 					return Err(std::io::Error::new(
 						std::io::ErrorKind::InvalidData,
@@ -679,22 +668,7 @@ pub(crate) mod tests {
 				assert_eq!(e.kind(), std::io::ErrorKind::InvalidData);
 				assert_eq!(
 					e.get_ref().unwrap().to_string(),
-					"trying to construct the transaction returned an error: foo"
-				);
-			}
-			Ok(_) => panic!("Expected error"),
-		}
-	}
-
-	#[test]
-	fn into_tx_from_json_response_with_no_hex_nor_error_fields() {
-		let response = JsonResponse(serde_json::json!({ "result": "foo" }));
-		match TryInto::<Transaction>::try_into(response) {
-			Err(e) => {
-				assert_eq!(e.kind(), std::io::ErrorKind::InvalidData);
-				assert_eq!(
-					e.get_ref().unwrap().to_string(),
-					"no hex nor error fields in the provided JSON object"
+					"expected JSON string"
 				);
 			}
 			Ok(_) => panic!("Expected error"),
@@ -707,9 +681,9 @@ pub(crate) mod tests {
 		match TryInto::<Transaction>::try_into(response) {
 			Err(e) => {
 				assert_eq!(e.kind(), std::io::ErrorKind::InvalidData);
-				assert_eq!(
-					e.get_ref().unwrap().to_string(),
-					"transaction couldn't be signed"
+				assert!(
+					e.get_ref().unwrap().to_string().contains(
+					"transaction couldn't be signed")
 				);
 			}
 			Ok(_) => panic!("Expected error"),