fix imports

near · Feb 21, 2024 · f5e36e3 · f5e36e3
1 parent 5c23657
commit f5e36e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git a/examples/mission-control/src/account.rs b/examples/mission-control/src/account.rs
@@ -1,39 +1,23 @@
 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;
 use near_sdk::my_near;
 
+#[my_near(borsh, json)]
 #[derive(
     PartialEq,
     Eq,
     PartialOrd,
     Hash,
-    Clone,
     Copy,
-    Serialize,
-    Deserialize,
     Debug,
-    BorshDeserialize,
-    BorshSerialize,
-    JsonSchema,
 )]
-#[serde(crate = "near_sdk::serde")]
-#[borsh(crate = "near_sdk::borsh")]
-#[schemars(crate = "near_sdk::schemars")]
 pub struct Quantity(pub i32);
 
 #[my_near(borsh, json)]
 pub struct X;
 
-// #[derive(Clone, Serialize, Deserialize, BorshDeserialize, BorshSerialize, JsonSchema)]
-// #[serde(crate = "near_sdk::serde")]
-// #[borsh(crate = "near_sdk::borsh")]
-// #[schemars(crate = "near_sdk::schemars")]
-
 #[my_near(borsh, json)]
 pub struct Account(pub HashMap<Asset, Quantity>);
 

diff --git a/near-sdk-macros/src/lib.rs b/near-sdk-macros/src/lib.rs
@@ -41,36 +41,24 @@ pub fn my_near(attr: TokenStream, item: TokenStream) -> TokenStream {
     parse_macro_input!(attr with tea_parser);
 
     let borsh = if has_borsh {quote!{
-        #[derive(BorshSerialize, BorshDeserialize)]
+        #[derive(near_sdk::borsh::BorshSerialize, near_sdk::borsh::BorshDeserialize)]
         #[borsh(crate = "near_sdk::borsh")]
     }} else {quote!{}};
     let json = if has_json {quote!{
-        #[derive(Serialize, Deserialize)]
+        #[derive(near_sdk::serde::Serialize, near_sdk::serde::Deserialize)]
         #[serde(crate = "near_sdk::serde")]
     }} else {quote!{}};
 
     let expanded = quote! {
-        // Call the derive macro you want to use
-        #[derive(Clone, JsonSchema)]
+        #[derive(Clone, near_sdk::schemars::JsonSchema)]
         #borsh
         #json
         #[schemars(crate = "near_sdk::schemars")]
-        // Include the original input
         #input
     };
 
     eprintln!("{}", expanded);
 
-    // let expanded = quote! {
-    //     // Call the derive macro you want to use
-    //     #[derive(Clone, Serialize, Deserialize, BorshDeserialize, BorshSerialize, JsonSchema)]
-    //     #[serde(crate = "near_sdk::serde")]
-    //     #[borsh(crate = "near_sdk::borsh")]
-    //     #[schemars(crate = "near_sdk::schemars")]
-    //     // Include the original input
-    //     #input
-    // };
-
     TokenStream::from(expanded)
 }