fix: private annotation codegen to include near_sdk prefix (#491)

* fix: private annotation codegen to include near_sdk prefix * fix tests also
near · Jul 30, 2021 · 7c6641c · 7c6641c
1 parent 6d5b537
commit 7c6641c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/HELP.md b/HELP.md
@@ -193,7 +193,7 @@ This is equivalent to:
 #[near_bindgen]
 impl Contract {
     pub fn resolve_transfer(&mut self) {
-        if env::current_account_id() != env::predecessor_account_id() {
+        if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
             near_sdk::env::panic(b"Method resolve_transfer is private");
         }
         env::log_str("This is a callback");

diff --git a/README.md b/README.md
@@ -148,7 +148,7 @@ pub fn my_method(&mut self) {
 /// Which is equivalent to
 
 pub fn my_method(&mut self ) {
-    if env::current_account_id() != env::predecessor_account_id() {
+    if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
         near_sdk::env::panic("Method method is private".as_bytes());
     }
 ...

diff --git a/near-sdk-macros/src/core_impl/code_generator/impl_item_method_info.rs b/near-sdk-macros/src/core_impl/code_generator/impl_item_method_info.rs
@@ -70,7 +70,7 @@ impl ImplItemMethodInfo {
         let is_private_check = if *is_private {
             let error = format!("Method {} is private", ident.to_string());
             quote! {
-                if env::current_account_id() != env::predecessor_account_id() {
+                if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
                     near_sdk::env::panic(#error.as_bytes());
                 }
             }

diff --git a/near-sdk-macros/src/core_impl/code_generator/item_impl_info.rs b/near-sdk-macros/src/core_impl/code_generator/item_impl_info.rs
@@ -289,7 +289,7 @@ mod tests {
             #[no_mangle]
             pub extern "C" fn method() {
                 near_sdk::env::setup_panic_hook();
-                if env::current_account_id() != env::predecessor_account_id() {
+                if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
                     near_sdk::env::panic("Method method is private".as_bytes());
                 }
                 #[derive(near_sdk :: serde :: Deserialize)]
@@ -333,7 +333,7 @@ mod tests {
             #[no_mangle]
             pub extern "C" fn method() {
                 near_sdk::env::setup_panic_hook();
-                if env::current_account_id() != env::predecessor_account_id() {
+                if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
                     near_sdk::env::panic("Method method is private".as_bytes());
                 }
                 let data: Vec<u8> = match near_sdk::env::promise_result(0u64) {
@@ -369,7 +369,7 @@ mod tests {
             #[no_mangle]
             pub extern "C" fn method() {
                 near_sdk::env::setup_panic_hook();
-                if env::current_account_id() != env::predecessor_account_id() {
+                if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
                     near_sdk::env::panic("Method method is private".as_bytes());
                 }
                 #[derive(near_sdk :: serde :: Deserialize)]
@@ -550,7 +550,7 @@ mod tests {
             #[no_mangle]
             pub extern "C" fn method() {
                 near_sdk::env::setup_panic_hook();
-                if env::current_account_id() != env::predecessor_account_id() {
+                if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
                     near_sdk::env::panic("Method method is private".as_bytes());
                 }
                 #[derive(near_sdk :: borsh :: BorshDeserialize)]
@@ -610,7 +610,7 @@ mod tests {
             #[no_mangle]
             pub extern "C" fn private_method() {
                 near_sdk::env::setup_panic_hook();
-                if env::current_account_id() != env::predecessor_account_id() {
+                if near_sdk::env::current_account_id() != near_sdk::env::predecessor_account_id() {
                     near_sdk::env::panic("Method private_method is private".as_bytes());
                 }
                 if near_sdk::env::attached_deposit() != 0 {