diff --git a/api/src/handlers.rs b/api/src/handlers.rs index f7220c9a3..e65f05237 100644 --- a/api/src/handlers.rs +++ b/api/src/handlers.rs @@ -743,11 +743,11 @@ impl PoolPushHandler { parse_body(req) .and_then(move |wrapper: TxWrapper| { util::from_hex(wrapper.tx_hex) - .map_err(|_| ErrorKind::RequestError("Bad request".to_owned()).into()) + .map_err(|e| ErrorKind::RequestError(format!("Bad request: {}", e)).into()) }) .and_then(move |tx_bin| { ser::deserialize(&mut &tx_bin[..]) - .map_err(|_| ErrorKind::RequestError("Bad request".to_owned()).into()) + .map_err(|e| ErrorKind::RequestError(format!("Bad request: {}", e)).into()) }) .and_then(move |tx: Transaction| { let source = pool::TxSource { @@ -770,7 +770,7 @@ impl PoolPushHandler { .add_to_pool(source, tx, !fluff, &header.hash()) .map_err(|e| { error!(LOGGER, "update_pool: failed with error: {:?}", e); - ErrorKind::RequestError("Bad request".to_owned()).into() + ErrorKind::Internal(format!("Failed to update pool: {:?}", e)).into() }) }), ) @@ -897,10 +897,12 @@ where Box::new( req.into_body() .concat2() - .map_err(|_e| ErrorKind::RequestError("Failed to read request".to_owned()).into()) + .map_err(|e| ErrorKind::RequestError(format!("Failed to read request: {}", e)).into()) .and_then(|body| match serde_json::from_reader(&body.to_vec()[..]) { Ok(obj) => ok(obj), - Err(_) => err(ErrorKind::RequestError("Invalid request body".to_owned()).into()), + Err(e) => { + err(ErrorKind::RequestError(format!("Invalid request body: {}", e)).into()) + } }), ) } diff --git a/wallet/src/libwallet/controller.rs b/wallet/src/libwallet/controller.rs index 513317fa2..b9aebdc12 100644 --- a/wallet/src/libwallet/controller.rs +++ b/wallet/src/libwallet/controller.rs @@ -566,7 +566,7 @@ fn create_error_response(e: Error) -> Response { .status(StatusCode::INTERNAL_SERVER_ERROR) .header("access-control-allow-origin", "*") .header("access-control-allow-headers", "Content-Type") - .body(format!("{}", e.kind()).into()) + .body(format!("{}", e).into()) .unwrap() } @@ -584,9 +584,6 @@ fn response>(status: StatusCode, text: T) -> Response { .header("access-control-allow-origin", "*") .body(text.into()) .unwrap() - //let mut resp = Response::new(text.into()); - //*resp.status_mut() = status; - //resp } fn parse_params(req: &Request) -> HashMap> { @@ -615,7 +612,9 @@ where .map_err(|_| ErrorKind::GenericError("Failed to read request".to_owned()).into()) .and_then(|body| match serde_json::from_reader(&body.to_vec()[..]) { Ok(obj) => ok(obj), - Err(_) => err(ErrorKind::GenericError("Invalid request body".to_owned()).into()), + Err(e) => { + err(ErrorKind::GenericError(format!("Invalid request body: {}", e)).into()) + } }), ) }