Merge branch 'master' into chore/abi-tests

near · Feb 4, 2024 · 19bfdc0 · 19bfdc0
2 parents b381798 + b427b2f
commit 19bfdc0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/examples/mission-control/src/account.rs b/examples/mission-control/src/account.rs
@@ -1,6 +1,7 @@
 use crate::asset::*;
 use crate::rate::*;
 use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
+use near_sdk::schemars::JsonSchema;
 use near_sdk::serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::ops;
@@ -17,14 +18,17 @@ use std::ops;
     Debug,
     BorshDeserialize,
     BorshSerialize,
+    JsonSchema,
 )]
 #[serde(crate = "near_sdk::serde")]
 #[borsh(crate = "near_sdk::borsh")]
+#[schemars(crate = "near_sdk::schemars")]
 pub struct Quantity(pub i32);
 
-#[derive(Clone, Serialize, Deserialize, BorshDeserialize, BorshSerialize)]
+#[derive(Clone, Serialize, Deserialize, BorshDeserialize, BorshSerialize, JsonSchema)]
 #[serde(crate = "near_sdk::serde")]
 #[borsh(crate = "near_sdk::borsh")]
+#[schemars(crate = "near_sdk::schemars")]
 pub struct Account(pub HashMap<Asset, Quantity>);
 
 pub enum Tranx {

diff --git a/examples/mission-control/src/asset.rs b/examples/mission-control/src/asset.rs
@@ -1,4 +1,5 @@
 use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
+use near_sdk::schemars::JsonSchema;
 use near_sdk::serde::{Deserialize, Serialize};
 
 #[derive(
@@ -13,9 +14,11 @@ use near_sdk::serde::{Deserialize, Serialize};
     Deserialize,
     BorshDeserialize,
     BorshSerialize,
+    JsonSchema,
 )]
 #[serde(crate = "near_sdk::serde")]
 #[borsh(crate = "near_sdk::borsh")]
+#[schemars(crate = "near_sdk::schemars")]
 pub enum Resource {
     Battery,
     RgbSensor,
@@ -35,9 +38,11 @@ pub enum Resource {
     Deserialize,
     BorshDeserialize,
     BorshSerialize,
+    JsonSchema,
 )]
 #[serde(crate = "near_sdk::serde")]
 #[borsh(crate = "near_sdk::borsh")]
+#[schemars(crate = "near_sdk::schemars")]
 pub enum Reward {
     Score,
     Token,
@@ -58,9 +63,11 @@ pub enum Reward {
     Deserialize,
     BorshDeserialize,
     BorshSerialize,
+    JsonSchema,
 )]
 #[serde(crate = "near_sdk::serde")]
 #[borsh(crate = "near_sdk::borsh")]
+#[schemars(crate = "near_sdk::schemars")]
 pub enum Asset {
     Resource(Resource),
     Reward(Reward),
@@ -69,10 +76,20 @@ pub enum Asset {
 }
 
 #[derive(
-    PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd, Ord, BorshDeserialize, BorshSerialize,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    PartialOrd,
+    Ord,
+    BorshDeserialize,
+    BorshSerialize,
+    JsonSchema,
 )]
 #[serde(crate = "near_sdk::serde")]
 #[borsh(crate = "near_sdk::borsh")]
+#[schemars(crate = "near_sdk::schemars")]
 pub enum Exchange {
     MissionTimeWithResource,
     MissionTimeWithTrust,