Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: API endpoints to query historical pair data #791

Merged
merged 1 commit into from
Jan 23, 2025
Merged

feat: API endpoints to query historical pair data #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions boltzr/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions boltzr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,18 @@ flate2 = "1.0.35"
pyroscope = { version = "0.5.8", optional = true }
pyroscope_pprofrs = { version = "0.2.8", optional = true }
csv = "1.3.1"
axum-extra = { version = "0.10.0", features = ["typed-header"] }
redis = { version = "0.28.1", features = ["tokio-comp", "r2d2"] }

[build-dependencies]
built = { version = "0.7.5", features = ["git2"] }
tonic-build = "0.12.3"

[dev-dependencies]
eventsource-client = "0.13.0"
http-body-util = "0.1.2"
mockall = "0.13.1"
rand = "0.8.5"
rstest = "0.24.0"
serial_test = "3.2.0"
tower = { version = "0.5.2", features = ["util"] }
169 changes: 169 additions & 0 deletions boltzr/src/api/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
use axum::body::Body;
use axum::extract::Request;
use axum::http::header::CONTENT_TYPE;
use axum::http::StatusCode;
use axum::middleware::Next;
use axum::response::{IntoResponse, Response};
use axum::Json;
use serde::{Deserialize, Serialize};

#[derive(Deserialize, Serialize)]
pub struct ApiError {
pub error: String,
}

pub struct AxumError(anyhow::Error);

impl IntoResponse for AxumError {
fn into_response(self) -> Response {
(
StatusCode::INTERNAL_SERVER_ERROR,
Json(ApiError {
error: format!("{}", self.0),
}),
)
.into_response()
}
}

impl<E> From<E> for AxumError
where
E: Into<anyhow::Error>,
{
fn from(err: E) -> Self {
Self(err.into())
}
}

pub async fn error_middleware(request: Request<Body>, next: Next) -> Response<Body> {
let response = next.run(request).await;

if response.status().is_server_error() || response.status().is_client_error() {
let is_json = match response.headers().get(CONTENT_TYPE) {
Some(content_type) => content_type == "application/json",
None => false,
};
if is_json {
return response;
}

let (parts, body) = response.into_parts();
let body_str = match axum::body::to_bytes(body, 1024 * 32).await {
Ok(bytes) => {
if !bytes.is_empty() {
match std::str::from_utf8(&bytes) {
Ok(str) => str.to_string(),
Err(_) => return Response::from_parts(parts, Body::from(bytes)),
}
} else {
return Response::from_parts(parts, Body::from(bytes));
}
}
Err(err) => {
return (
StatusCode::INTERNAL_SERVER_ERROR,
Json(ApiError {
error: format!("could not handle body: {}", err),
}),
)
.into_response()
}
};

return (parts.status, Json(ApiError { error: body_str })).into_response();
}

response
}

#[cfg(test)]
mod test {
use super::*;
use axum::routing::get;
use axum::Router;
use http_body_util::BodyExt;
use rstest::rstest;
use tower::util::ServiceExt;

#[tokio::test]
async fn test_error_middleware_ignore_success() {
let msg = "gm";

let router = Router::new()
.route(
"/",
get(move || async move { (StatusCode::CREATED, msg).into_response() }),
)
.layer(axum::middleware::from_fn(error_middleware));

let res = router
.oneshot(Request::builder().uri("/").body(Body::empty()).unwrap())
.await
.unwrap();

assert_eq!(res.status(), StatusCode::CREATED);

let body = res.into_body().collect().await.unwrap().to_bytes();
assert_eq!(std::str::from_utf8(&body).unwrap(), msg);
}

#[rstest]
#[case(StatusCode::BAD_REQUEST)]
#[case(StatusCode::NOT_IMPLEMENTED)]
#[tokio::test]
async fn test_error_middleware_already_json(#[case] code: StatusCode) {
let msg = "ngmi";

let router = Router::new()
.route(
"/",
get(move || async move {
(
code,
Json(ApiError {
error: msg.to_owned(),
}),
)
.into_response()
}),
)
.layer(axum::middleware::from_fn(error_middleware));

let res = router
.oneshot(Request::builder().uri("/").body(Body::empty()).unwrap())
.await
.unwrap();

assert_eq!(res.status(), code);

let body = res.into_body().collect().await.unwrap().to_bytes();
let body: ApiError = serde_json::from_slice(&body).unwrap();
assert_eq!(body.error, msg);
}

#[rstest]
#[case(StatusCode::BAD_REQUEST)]
#[case(StatusCode::NOT_IMPLEMENTED)]
#[tokio::test]
async fn test_error_middleware_to_json(#[case] code: StatusCode) {
let msg = "ngmi";

let router = Router::new()
.route(
"/",
get(move || async move { (code, msg.to_owned()).into_response() }),
)
.layer(axum::middleware::from_fn(error_middleware));

let res = router
.oneshot(Request::builder().uri("/").body(Body::empty()).unwrap())
.await
.unwrap();

assert_eq!(res.status(), code);

let body = res.into_body().collect().await.unwrap().to_bytes();
let body: ApiError = serde_json::from_slice(&body).unwrap();
assert_eq!(body.error, msg);
}
}
Loading
Loading