rename my_near to near

examples/mission-control/src/account.rs

@@ -2,7 +2,7 @@ use crate::asset::*;
 use crate::rate::*;
 use std::collections::HashMap;
 use std::ops;
-use near_sdk::my_near;
+use near_sdk::near;
 
 #[derive(
     PartialEq,
@@ -13,14 +13,14 @@ use near_sdk::my_near;
     Copy,
     Debug,
 )]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub struct Quantity(pub i32);
 
-#[my_near]
+#[near]
 pub struct X;
 
 #[derive(Clone)]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub struct Account(pub HashMap<Asset, Quantity>);
 
 pub enum Tranx {

examples/mission-control/src/agent.rs

@@ -4,10 +4,10 @@ use crate::rate::*;
 use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
 use near_sdk::serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use near_sdk::my_near;
+use near_sdk::near;
 
 #[derive(Clone)]
-#[my_near(serializers=[json, borsh])]
+#[near(serializers=[json, borsh])]
 pub struct Agent {
     pub account: Account,
     pub is_alive: bool,

examples/mission-control/src/asset.rs

@@ -1,7 +1,7 @@
 use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
 use near_sdk::schemars::JsonSchema;
 use near_sdk::serde::{Deserialize, Serialize};
-use near_sdk::my_near;
+use near_sdk::near;
 
 #[derive(
     PartialEq,
@@ -12,7 +12,7 @@ use near_sdk::my_near;
     Clone,
     Copy,
 )]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub enum Resource {
     Battery,
     RgbSensor,
@@ -29,7 +29,7 @@ pub enum Resource {
     Clone,
     Copy,
 )]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub enum Reward {
     Score,
     Token,
@@ -47,7 +47,7 @@ pub enum Reward {
     Clone,
     Copy,
 )]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub enum Asset {
     Resource(Resource),
     Reward(Reward),
@@ -62,7 +62,7 @@ pub enum Asset {
     PartialOrd,
     Ord
 )]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub enum Exchange {
     MissionTimeWithResource,
     MissionTimeWithTrust,

examples/mission-control/src/mission_control.rs

@@ -7,21 +7,21 @@ use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
 use near_sdk::serde::{Deserialize, Serialize};
 use near_sdk::{env, near_bindgen};
 use std::collections::HashMap;
-use near_sdk::my_near;
+use near_sdk::near;
 
 // #[near_bindgen]
 // #[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)]
 // #[serde(crate = "near_sdk::serde")]
 // #[borsh(crate = "near_sdk::borsh")]
-#[my_near(serializers=[json, borsh, bindgen])]
+#[near(serializers=[json, borsh, bindgen])]
 pub struct MissionControl {
     account: Account,
     agents: HashMap<AccountId, Agent>,
     rates: HashMap<Exchange, Rate>,
 }
 
-// #[my_near]
-#[my_near(serializers=[json, borsh, bindgen])]
+// #[near]
+#[near(serializers=[json, borsh, bindgen])]
 impl MissionControl {
     pub fn add_agent(&mut self) {
         let account_id = env::signer_account_id();

examples/mission-control/src/rate.rs

@@ -1,10 +1,10 @@
 use crate::account::*;
 use crate::asset::*;
 use std::collections::HashMap;
-use near_sdk::my_near;
+use near_sdk::near;
 
 #[derive(PartialEq, Eq)]
-#[my_near(serializers = [json, borsh])]
+#[near(serializers = [json, borsh])]
 pub struct Rate {
     pub credit: HashMap<Asset, Quantity>,
     pub debit: HashMap<Asset, Quantity>,

near-sdk-macros/src/lib.rs

@@ -69,7 +69,7 @@ pub fn kek(attr: TokenStream, item: TokenStream) -> TokenStream {
 }
 
 #[proc_macro_attribute]
-pub fn my_near(attr: TokenStream, item: TokenStream) -> TokenStream {
+pub fn near(attr: TokenStream, item: TokenStream) -> TokenStream {
     let attr_args = match NestedMeta::parse_meta_list(attr.into()) {
         Ok(v) => v,
         Err(e) => { return TokenStream::from(Error::from(e).write_errors()); }
@@ -304,6 +304,13 @@ pub fn near_bindgen(attr: TokenStream, item: TokenStream) -> TokenStream {
         let abi_embedded = abi::embed();
         #[cfg(not(feature = "__abi-embed-checked"))]
         let abi_embedded = quote! {};
+
+        eprintln!("ext structs:\n {}", ext_gen);
+        eprintln!("abi embedded:\n {}", abi_embedded);
+        eprintln!("metadata:\n {}", metadata);
+        eprintln!("metadata_impl_gen:\n {}", metadata_impl_gen);
+        eprintln!("finish");
+
         TokenStream::from(quote! {
             #input
             #ext_gen
@@ -390,14 +397,15 @@ pub fn near_bindgen(attr: TokenStream, item: TokenStream) -> TokenStream {
         #[cfg(not(feature = "__abi-embed-checked"))]
         let abi_embedded = quote! {};
 
-        // eprintln!("{}", x);
-        // eprintln!("hello");
+        eprintln!("impl is: {}", x);
+        eprintln!("finish impl");
         TokenStream::from(quote! {
             #x
             #abi_embedded
             #metadata
             #metadata_impl_gen
         })
+
     } else {
         TokenStream::from(
             syn::Error::new(

near-sdk/src/lib.rs

@@ -10,7 +10,7 @@ extern crate quickcheck;
 #[cfg(feature = "abi")]
 pub use near_sdk_macros::NearSchema;
 pub use near_sdk_macros::{
-    ext_contract, near_bindgen, my_near, kek, BorshStorageKey, EventMetadata, FunctionError, PanicOnDefault,
+    ext_contract, near_bindgen, near, kek, BorshStorageKey, EventMetadata, FunctionError, PanicOnDefault,
 };
 
 pub mod store;