refactor(env)!: remove public key generics from promise API (#495)

* refactor(env)!: remove public key generics from promise API * update changelog * update wasm blobs
near · Aug 3, 2021 · 503f9f3 · 503f9f3
1 parent 1859ce4
commit 503f9f3
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+- Removes `PublicKey` generic on `env` promise batch calls. Functions now just take a reference to the `PublicKey`.
 
 ## `4.0.0-pre.1` [07-23-2021]
 * Implements new `LazyOption` type under `unstable` feature. Similar to `Lazy` but is optional to set a value. [PR 444](https://github.com/near/near-sdk-rs/pull/444).

diff --git a/examples/cross-contract-high-level/res/cross_contract_high_level.wasm b/examples/cross-contract-high-level/res/cross_contract_high_level.wasm
diff --git a/examples/cross-contract-low-level/res/cross_contract_low_level.wasm b/examples/cross-contract-low-level/res/cross_contract_low_level.wasm
diff --git a/examples/fungible-token/res/defi.wasm b/examples/fungible-token/res/defi.wasm
diff --git a/examples/fungible-token/res/fungible_token.wasm b/examples/fungible-token/res/fungible_token.wasm
diff --git a/examples/lockable-fungible-token/res/lockable_fungible_token.wasm b/examples/lockable-fungible-token/res/lockable_fungible_token.wasm
diff --git a/examples/mission-control/res/mission_control.wasm b/examples/mission-control/res/mission_control.wasm
diff --git a/examples/non-fungible-token/res/approval_receiver.wasm b/examples/non-fungible-token/res/approval_receiver.wasm
diff --git a/examples/non-fungible-token/res/non_fungible_token.wasm b/examples/non-fungible-token/res/non_fungible_token.wasm
diff --git a/examples/non-fungible-token/res/token_receiver.wasm b/examples/non-fungible-token/res/token_receiver.wasm
diff --git a/examples/status-message-collections/res/status_message_collections.wasm b/examples/status-message-collections/res/status_message_collections.wasm
diff --git a/examples/status-message/res/status_message.wasm b/examples/status-message/res/status_message.wasm
diff --git a/examples/test-contract/res/test_contract.wasm b/examples/test-contract/res/test_contract.wasm
diff --git a/near-sdk/src/environment/env.rs b/near-sdk/src/environment/env.rs
@@ -3,7 +3,6 @@
 //! whenever possible. In case of cross-contract calls prefer using even higher-level API available
 //! through `callback_args`, `callback_args_vec`, `ext_contract`, `Promise`, and `PromiseOrValue`.
 
-use std::borrow::Borrow;
 #[cfg(not(target_arch = "wasm32"))]
 use std::cell::RefCell;
 use std::convert::TryFrom;
@@ -351,12 +350,11 @@ pub fn promise_batch_action_transfer(promise_index: PromiseIndex, amount: Balanc
     unsafe { sys::promise_batch_action_transfer(promise_index, &amount as *const Balance as _) }
 }
 
-pub fn promise_batch_action_stake<P: Borrow<PublicKey>>(
+pub fn promise_batch_action_stake(
     promise_index: PromiseIndex,
     amount: Balance,
-    public_key: P,
+    public_key: &PublicKey,
 ) {
-    let public_key = public_key.borrow();
     unsafe {
         sys::promise_batch_action_stake(
             promise_index,
@@ -366,12 +364,11 @@ pub fn promise_batch_action_stake<P: Borrow<PublicKey>>(
         )
     }
 }
-pub fn promise_batch_action_add_key_with_full_access<P: Borrow<PublicKey>>(
+pub fn promise_batch_action_add_key_with_full_access(
     promise_index: PromiseIndex,
-    public_key: P,
+    public_key: &PublicKey,
     nonce: u64,
 ) {
-    let public_key = public_key.borrow();
     unsafe {
         sys::promise_batch_action_add_key_with_full_access(
             promise_index,
@@ -381,15 +378,14 @@ pub fn promise_batch_action_add_key_with_full_access<P: Borrow<PublicKey>>(
         )
     }
 }
-pub fn promise_batch_action_add_key_with_function_call<P: Borrow<PublicKey>>(
+pub fn promise_batch_action_add_key_with_function_call(
     promise_index: PromiseIndex,
-    public_key: P,
+    public_key: &PublicKey,
     nonce: u64,
     allowance: Balance,
     receiver_id: &AccountId,
     method_names: &[u8],
 ) {
-    let public_key = public_key.borrow();
     let receiver_id: &str = receiver_id.as_ref();
     unsafe {
         sys::promise_batch_action_add_key_with_function_call(
@@ -405,11 +401,7 @@ pub fn promise_batch_action_add_key_with_function_call<P: Borrow<PublicKey>>(
         )
     }
 }
-pub fn promise_batch_action_delete_key<P: Borrow<PublicKey>>(
-    promise_index: PromiseIndex,
-    public_key: P,
-) {
-    let public_key = public_key.borrow();
+pub fn promise_batch_action_delete_key(promise_index: PromiseIndex, public_key: &PublicKey) {
     unsafe {
         sys::promise_batch_action_delete_key(
             promise_index,