Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions crates/sigma-api/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ pub fn with_endpoints(router: Router<State>) -> Router<State> {
use endpoint::*;
router
.route(health_check::PATH, get(health_check::handler))
.route(get_events::PATH, get(get_events::handler))
.route(get_hashes::PATH, get(get_hashes::handler))
.route(get_events::PATH[0], get(get_events::handler_start_end))
.route(get_events::PATH[1], get(get_events::handler_start))
.route(get_hashes::PATH[0], get(get_hashes::handler_start_end))
.route(get_hashes::PATH[1], get(get_hashes::handler_start))
.route(subscribe_events::PATH, get(subscribe_events::handler))
}

Expand Down
20 changes: 16 additions & 4 deletions crates/sigma-api/src/server/endpoint/get_events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,28 @@ pub enum Error {
}

/// The path for the get events endpoint.
pub const PATH: &str = "/get-events/{start}/{end}";
pub const PATH: [&str; 2] = ["/get-events/{start}/{end}", "/get-events/{start}"];

/// Handler for the get events endpoint.
pub async fn handler(
pub async fn handler_start_end(
State(state): State<crate::State>,
Path((start, end)): Path<(String, Option<String>)>,
Path((start, end)): Path<(String, String)>,
) -> Result<Json<Option<Vec<Signed<Event>>>>, Error> {
// Parse the event height from the path parameters.
let start = parse_height(start.as_str()).ok_or(Error::InvalidEventHeight)?;
let end = parse_height(end.as_deref().unwrap_or("latest")).ok_or(Error::InvalidEventHeight)?;
let end = parse_height(end.as_str()).ok_or(Error::InvalidEventHeight)?;

Ok(Json(get_events_at_range(&state, start..end).await))
}

/// Handler for the get events endpoint.
pub async fn handler_start(
State(state): State<crate::State>,
Path(start): Path<String>,
) -> Result<Json<Option<Vec<Signed<Event>>>>, Error> {
// Parse the event height from the path parameters.
let start = parse_height(start.as_str()).ok_or(Error::InvalidEventHeight)?;
let end = HeightType::Latest;

Ok(Json(get_events_at_range(&state, start..end).await))
}
Expand Down
20 changes: 16 additions & 4 deletions crates/sigma-api/src/server/endpoint/get_hashes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,28 @@ pub enum Error {
}

/// The path for the get hashes endpoint.
pub const PATH: &str = "/get-hashes/{start}/{end}";
pub const PATH: [&str; 2] = ["/get-hashes/{start}/{end}", "/get-hashes/{start}"];

/// Handler for the get hashes endpoint.
pub async fn handler(
pub async fn handler_start_end(
State(state): State<crate::State>,
Path((start, end)): Path<(String, Option<String>)>,
Path((start, end)): Path<(String, String)>,
) -> Result<Json<Option<Vec<Signed<Hash>>>>, Error> {
// Parse the hash height from the path parameters.
let start = parse_height(start.as_str()).ok_or(Error::InvalidHashHeight)?;
let end = parse_height(end.as_deref().unwrap_or("latest")).ok_or(Error::InvalidHashHeight)?;
let end = parse_height(end.as_str()).ok_or(Error::InvalidHashHeight)?;

Ok(Json(get_hashes_at_range(&state, start..end).await))
}

/// Handler for the get hashes endpoint.
pub async fn handler_start(
State(state): State<crate::State>,
Path(start): Path<String>,
) -> Result<Json<Option<Vec<Signed<Hash>>>>, Error> {
// Parse the hash height from the path parameters.
let start = parse_height(start.as_str()).ok_or(Error::InvalidHashHeight)?;
let end = HeightType::Latest;

Ok(Json(get_hashes_at_range(&state, start..end).await))
}
Expand Down