Fix open api schema (#160)

pyth-network · Oct 2, 2024 · 98ef255 · 98ef255
1 parent 57dcf2b
commit 98ef255
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/auction-server/Cargo.lock b/auction-server/Cargo.lock
diff --git a/auction-server/Cargo.toml b/auction-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "auction-server"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 license-file = "license.txt"
 

diff --git a/auction-server/src/api.rs b/auction-server/src/api.rs
@@ -315,6 +315,7 @@ pub async fn start_api(run_options: RunOptions, store: Arc<StoreNew>) -> Result<
     opportunity_api::OpportunityParamsSvm,
     opportunity_api::OpportunityParamsEvm,
     opportunity_api::OpportunityParamsV1Svm,
+    opportunity_api::OpportunityParamsV1Evm,
 
     ErrorBodyResponse,
     ClientRequest,

diff --git a/auction-server/src/opportunity/api.rs b/auction-server/src/opportunity/api.rs
@@ -60,6 +60,7 @@ use {
     std::sync::Arc,
     time::OffsetDateTime,
     utoipa::{
+        schema,
         IntoParams,
         ToResponse,
         ToSchema,
@@ -196,7 +197,8 @@ pub enum OpportunityCreateEvm {
 }
 
 
-pub type OpportunityParamsV1Evm = OpportunityCreateV1Evm;
+#[derive(Serialize, Deserialize, ToSchema, Clone, PartialEq, Debug, ToResponse)]
+pub struct OpportunityParamsV1Evm(pub OpportunityCreateV1Evm);
 
 #[derive(Serialize, Deserialize, ToSchema, Clone, PartialEq, Debug, ToResponse)]
 #[serde(tag = "version")]
@@ -348,7 +350,7 @@ pub struct OpportunitySvm {
 impl OpportunityEvm {
     pub fn get_chain_id(&self) -> &ChainId {
         match &self.params {
-            OpportunityParamsEvm::V1(params) => &params.chain_id,
+            OpportunityParamsEvm::V1(params) => &params.0.chain_id,
         }
     }
 }

diff --git a/auction-server/src/opportunity/entities/opportunity_evm.rs b/auction-server/src/opportunity/entities/opportunity_evm.rs
@@ -93,25 +93,27 @@ impl From<OpportunityEvm> for api::OpportunityEvm {
         api::OpportunityEvm {
             opportunity_id: val.id,
             creation_time:  val.creation_time,
-            params:         api::OpportunityParamsEvm::V1(api::OpportunityParamsV1Evm {
-                permission_key:    val.permission_key.clone(),
-                chain_id:          val.chain_id.clone(),
-                target_contract:   val.target_contract,
-                target_calldata:   val.target_calldata.clone(),
-                target_call_value: val.target_call_value,
-                sell_tokens:       val
-                    .sell_tokens
-                    .clone()
-                    .into_iter()
-                    .map(|t| t.into())
-                    .collect(),
-                buy_tokens:        val
-                    .buy_tokens
-                    .clone()
-                    .into_iter()
-                    .map(|t| t.into())
-                    .collect(),
-            }),
+            params:         api::OpportunityParamsEvm::V1(api::OpportunityParamsV1Evm(
+                api::OpportunityCreateV1Evm {
+                    permission_key:    val.permission_key.clone(),
+                    chain_id:          val.chain_id.clone(),
+                    target_contract:   val.target_contract,
+                    target_calldata:   val.target_calldata.clone(),
+                    target_call_value: val.target_call_value,
+                    sell_tokens:       val
+                        .sell_tokens
+                        .clone()
+                        .into_iter()
+                        .map(|t| t.into())
+                        .collect(),
+                    buy_tokens:        val
+                        .buy_tokens
+                        .clone()
+                        .into_iter()
+                        .map(|t| t.into())
+                        .collect(),
+                },
+            )),
         }
     }
 }