Merge pull request #1093 from rainlanguage/2024-12-18-yaml-files-tsif…

…y-fix Fixing default macro for config structs
rainlanguage · Jan 3, 2025 · 3ab3ada · 3ab3ada
2 parents 0645f38 + 70454f8
commit 3ab3ada
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/crates/settings/src/deployer.rs b/crates/settings/src/deployer.rs
@@ -9,7 +9,9 @@ use std::{
 use strict_yaml_rust::StrictYaml;
 use thiserror::Error;
 use typeshare::typeshare;
-use yaml::{optional_string, require_hash, require_string, YamlError, YamlParsableHash};
+use yaml::{
+    default_document, optional_string, require_hash, require_string, YamlError, YamlParsableHash,
+};
 
 #[cfg(target_family = "wasm")]
 use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
@@ -18,9 +20,8 @@ use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
 #[serde(rename_all = "kebab-case")]
-#[serde(default)]
 pub struct Deployer {
-    #[serde(skip)]
+    #[serde(skip, default = "default_document")]
     pub document: Arc<RwLock<StrictYaml>>,
     pub key: String,
     #[typeshare(typescript(type = "string"))]

diff --git a/crates/settings/src/metaboard.rs b/crates/settings/src/metaboard.rs
@@ -1,4 +1,4 @@
-use crate::yaml::{require_hash, require_string, YamlError, YamlParsableHash};
+use crate::yaml::{default_document, require_hash, require_string, YamlError, YamlParsableHash};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
@@ -11,9 +11,8 @@ use url::{ParseError, Url};
 #[typeshare]
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
-#[serde(default)]
 pub struct Metaboard {
-    #[serde(skip)]
+    #[serde(skip, default = "default_document")]
     pub document: Arc<RwLock<StrictYaml>>,
     pub key: String,
     #[typeshare(typescript(type = "string"))]

diff --git a/crates/settings/src/network.rs b/crates/settings/src/network.rs
@@ -1,5 +1,7 @@
 use crate::config_source::*;
-use crate::yaml::{optional_string, require_hash, require_string, YamlError, YamlParsableHash};
+use crate::yaml::{
+    default_document, optional_string, require_hash, require_string, YamlError, YamlParsableHash,
+};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::{
@@ -18,9 +20,8 @@ use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
 #[serde(rename_all = "kebab-case")]
-#[serde(default)]
 pub struct Network {
-    #[serde(skip)]
+    #[serde(skip, default = "default_document")]
     pub document: Arc<RwLock<StrictYaml>>,
     pub key: String,
     #[typeshare(typescript(type = "string"))]

diff --git a/crates/settings/src/orderbook.rs b/crates/settings/src/orderbook.rs
@@ -9,14 +9,15 @@ use strict_yaml_rust::StrictYaml;
 use subgraph::Subgraph;
 use thiserror::Error;
 use typeshare::typeshare;
-use yaml::{optional_string, require_hash, require_string, YamlError, YamlParsableHash};
+use yaml::{
+    default_document, optional_string, require_hash, require_string, YamlError, YamlParsableHash,
+};
 
 #[typeshare]
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
-#[serde(default)]
 pub struct Orderbook {
-    #[serde(skip)]
+    #[serde(skip, default = "default_document")]
     pub document: Arc<RwLock<StrictYaml>>,
     pub key: String,
     #[typeshare(typescript(type = "string"))]

diff --git a/crates/settings/src/subgraph.rs b/crates/settings/src/subgraph.rs
@@ -1,4 +1,4 @@
-use crate::yaml::{require_hash, require_string, YamlError, YamlParsableHash};
+use crate::yaml::{default_document, require_hash, require_string, YamlError, YamlParsableHash};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
@@ -11,9 +11,8 @@ use url::{ParseError, Url};
 #[typeshare]
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
-#[serde(default)]
 pub struct Subgraph {
-    #[serde(skip)]
+    #[serde(skip, default = "default_document")]
     pub document: Arc<RwLock<StrictYaml>>,
     pub key: String,
     #[typeshare(typescript(type = "string"))]

diff --git a/crates/settings/src/token.rs b/crates/settings/src/token.rs
@@ -1,4 +1,6 @@
-use crate::yaml::{optional_string, require_hash, require_string, YamlError, YamlParsableHash};
+use crate::yaml::{
+    default_document, optional_string, require_hash, require_string, YamlError, YamlParsableHash,
+};
 use crate::*;
 use alloy::primitives::{hex::FromHexError, Address};
 use serde::{Deserialize, Serialize};
@@ -16,9 +18,8 @@ use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
-#[serde(default)]
 pub struct Token {
-    #[serde(skip)]
+    #[serde(skip, default = "default_document")]
     pub document: Arc<RwLock<StrictYaml>>,
     pub key: String,
     #[typeshare(typescript(type = "Network"))]