fix-api

Author: m30m

apps/fortuna/src/api.rs

@@ -26,8 +26,7 @@ use {
     tokio::sync::RwLock,
     url::Url,
 };
-pub use {chain_ids::*, index::*, live::*, metrics::*, ready::*, revelation::*};
-use crate::api::explorer::get_requests;
+pub use {chain_ids::*, index::*, live::*, metrics::*, ready::*, revelation::*, explorer::*};
 
 mod chain_ids;
 mod explorer;
@@ -322,7 +321,7 @@ pub fn routes(state: ApiState) -> Router<(), Body> {
         .route("/metrics", get(metrics))
         .route("/ready", get(ready))
         .route("/v1/chains", get(chain_ids))
-        .route("/v1/explorer", get(get_requests))
+        .route("/v1/explorer", get(explorer))
         .route(
             "/v1/chains/:chain_id/revelations/:sequence",
             get(revelation),

apps/fortuna/src/api/explorer.rs

@@ -5,7 +5,7 @@ use crate::api::{
 use axum::extract::{Query, State};
 use axum::Json;
 use ethers::types::TxHash;
-use utoipa::IntoParams;
+use utoipa::{IntoParams, ToSchema};
 
 #[derive(Debug, serde::Serialize, serde::Deserialize, IntoParams)]
 #[into_params(parameter_in=Query)]
@@ -20,7 +20,7 @@ pub struct ExplorerQueryParams {
     #[param(value_type = Option<String>)]
     pub chain_id: Option<ChainId>,
 }
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, ToSchema)]
 #[serde(rename_all = "kebab-case")]
 pub enum ExplorerQueryParamsMode {
     TxHash,
@@ -31,14 +31,13 @@ pub enum ExplorerQueryParamsMode {
 
 #[utoipa::path(
     get,
-    path = "/v1/explorer/",
+    path = "/v1/explorer",
     responses(
-(status = 200, description = "Random value successfully retrieved", body = GetRandomValueResponse),
-(status = 403, description = "Random value cannot currently be retrieved", body = String)
+    (status = 200, description = "Random value successfully retrieved", body = Vec<RequestJournal>)
     ),
     params(ExplorerQueryParams)
 )]
-pub async fn get_requests(
+pub async fn explorer(
     State(state): State<crate::api::ApiState>,
     Query(query_params): Query<ExplorerQueryParams>,
 ) -> anyhow::Result<Json<Vec<RequestJournal>>, RestError> {

apps/fortuna/src/command/run.rs

@@ -35,10 +35,13 @@ pub async fn run_api(
     paths(
     crate::api::revelation,
     crate::api::chain_ids,
+    crate::api::explorer,
     ),
     components(
     schemas(
     crate::api::GetRandomValueResponse,
+    crate::api::RequestJournal,
+    crate::api::ExplorerQueryParamsMode,
     crate::api::Blob,
     crate::api::BinaryEncoding,
     )