diff --git a/controller/src/controller.rs b/controller/src/controller.rs index cb7ea39b..927781c1 100644 --- a/controller/src/controller.rs +++ b/controller/src/controller.rs @@ -766,7 +766,7 @@ where &self, req: Request, api: Foreign, - ) -> Box + Send> { + ) -> Box + Send> { Box::new(parse_body(req).and_then( //TODO: No way to insert a message from the params move |slate_str: String| { @@ -776,7 +776,7 @@ where err(e) } else { match api.receive_tx(&slate, None, None) { - Ok(s) => ok(serde_json::to_string(&s).unwrap()), + Ok(s) => ok(s), Err(e) => { error!("receive_tx: failed with error: {}", e); err(e) @@ -803,7 +803,7 @@ where ), "receive_tx" => Box::new( self.receive_tx(req, api) - .and_then(|res| ok(json_response_slate(&res))), + .and_then(|res| ok(json_response(&res))), ), _ => Box::new(ok(response(StatusCode::BAD_REQUEST, "unknown action"))), } @@ -915,29 +915,6 @@ where } } -// As above, dealing with stringified slate output -// from older versions. -// Older versions are expecting a slate objects, anything from -// 1.1.0 up is expecting a string -fn json_response_slate(s: &T) -> Response -where - T: Serialize, -{ - match serde_json::to_string(s) { - Ok(mut json) => { - if let None = json.find("version_info") { - let mut r = json.clone(); - r.pop(); - r.remove(0); - // again, for backwards slate compat - json = r.replace("\\\"", "\"") - } - response(StatusCode::OK, json) - } - Err(_) => response(StatusCode::INTERNAL_SERVER_ERROR, ""), - } -} - // pretty-printed version of above fn json_response_pretty(s: &T) -> Response where