fix: metadata schema in rust models

blockfrost · Nov 7, 2023 · 736e5d4 · 736e5d4
1 parent a474c4e
commit 736e5d4
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 82 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,25 +1,26 @@
 {
-    "cSpell.words": [
-        "Bdatum",
-        "Bech",
-        "blockfrost",
-        "Bscript",
-        "Bstake",
-        "cbor",
-        "delegators",
-        "IPFS",
-        "Lovelaces",
-        "Milkomeda",
-        "mirs",
-        "nutlink",
-        "Ogmios",
-        "openapi",
-        "redoc",
-        "redocly",
-        "tbody",
-        "timelock",
-        "UTXO",
-        "utxos",
-        "xpub"
-    ]
-}
+  "cSpell.words": [
+    "Bdatum",
+    "Bech",
+    "blockfrost",
+    "Bscript",
+    "Bstake",
+    "cbor",
+    "decentralisation",
+    "delegators",
+    "IPFS",
+    "Lovelaces",
+    "Milkomeda",
+    "mirs",
+    "nutlink",
+    "Ogmios",
+    "openapi",
+    "redoc",
+    "redocly",
+    "tbody",
+    "timelock",
+    "UTXO",
+    "utxos",
+    "xpub"
+  ]
+}
diff --git a/rust/CHNAGELOG.md b/rust/CHNAGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+## [Unreleased]
+
+## [0.0.2] - 2023-07-11
+
+### Fixed
+
+- json_metadata schema
+
+## [0.0.1] - 2023-07-06
+
+### Added
+
+- initial commit
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "blockfrost-openapi"
 description = "Blockfrost OpenAPI generated models"
-version = "0.0.1"
+version = "0.0.2"
 edition = "2021"
 build = "build.rs"
 license = "Apache-2.0"

diff --git a/rust/build.rs b/rust/build.rs
@@ -1,30 +1,30 @@
-use std::env;
-use std::fs;
-use std::path::Path;
+// use std::env;
+// use std::fs;
+// use std::path::Path;
 
 fn main() {
-    let out_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
-    let model_path = Path::new("src/models");
-    let entries = fs::read_dir(model_path).unwrap();
+    // let out_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
+    // let model_path = Path::new("src/models");
+    // let entries = fs::read_dir(model_path).unwrap();
 
-    let mut content = String::new();
+    // let mut content = String::new();
 
-    for entry in entries {
-        let entry = entry.unwrap();
-        let path = entry.path();
-        let file_stem = path.file_stem().unwrap();
+    // for entry in entries {
+    //     let entry = entry.unwrap();
+    //     let path = entry.path();
+    //     let file_stem = path.file_stem().unwrap();
 
-        if let Some(file_name_str) = file_stem.to_str() {
-            if file_name_str == "mod" {
-                continue;
-            }
-            content.push_str(&format!("pub mod {};\n", file_name_str));
-        } else {
-            panic!("File name is not valid Unicode: {:?}", file_stem);
-        }
-    }
+    //     if let Some(file_name_str) = file_stem.to_str() {
+    //         if file_name_str == "mod" {
+    //             continue;
+    //         }
+    //         content.push_str(&format!("pub mod {};\n", file_name_str));
+    //     } else {
+    //         panic!("File name is not valid Unicode: {:?}", file_stem);
+    //     }
+    // }
 
-    let dest_path = Path::new(&out_dir).join("./src/models/mod.rs");
+    // let dest_path = Path::new(&out_dir).join("./src/models/mod.rs");
 
-    fs::write(dest_path, content).unwrap();
+    // fs::write(dest_path, content).unwrap();
 }
diff --git a/rust/src/models/tx_content_metadata_inner.rs b/rust/src/models/tx_content_metadata_inner.rs
@@ -8,25 +8,11 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use super::tx_content_metadata_inner_json_metadata::TxContentMetadataInnerJsonMetadata;
-
 #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
 pub struct TxContentMetadataInner {
     /// Metadata label
     #[serde(rename = "label")]
     pub label: String,
     #[serde(rename = "json_metadata")]
-    pub json_metadata: Box<TxContentMetadataInnerJsonMetadata>,
-}
-
-impl TxContentMetadataInner {
-    pub fn new(
-        label: String,
-        json_metadata: TxContentMetadataInnerJsonMetadata,
-    ) -> TxContentMetadataInner {
-        TxContentMetadataInner {
-            label,
-            json_metadata: Box::new(json_metadata),
-        }
-    }
+    pub json_metadata: Option<serde_json::Value>,
 }
diff --git a/rust/src/models/tx_metadata_label_json_inner.rs b/rust/src/models/tx_metadata_label_json_inner.rs
@@ -8,29 +8,11 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use super::tx_metadata_label_json_inner_json_metadata::TxMetadataLabelJsonInnerJsonMetadata;
-
 #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
 pub struct TxMetadataLabelJsonInner {
     /// Transaction hash that contains the specific metadata
     #[serde(rename = "tx_hash")]
     pub tx_hash: String,
     #[serde(rename = "json_metadata", deserialize_with = "Option::deserialize")]
-    pub json_metadata: Option<Box<TxMetadataLabelJsonInnerJsonMetadata>>,
-}
-
-impl TxMetadataLabelJsonInner {
-    pub fn new(
-        tx_hash: String,
-        json_metadata: Option<TxMetadataLabelJsonInnerJsonMetadata>,
-    ) -> TxMetadataLabelJsonInner {
-        TxMetadataLabelJsonInner {
-            tx_hash,
-            json_metadata: if let Some(x) = json_metadata {
-                Some(Box::new(x))
-            } else {
-                None
-            },
-        }
-    }
+    pub json_metadata: Option<serde_json::Value>,
 }