fix some problems in test core macos (comments)

near · May 31, 2024 · 47aec44 · 47aec44
1 parent c0f4a90
commit 47aec44
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 29 deletions.
diff --git a/near-contract-standards/src/fungible_token/core.rs b/near-contract-standards/src/fungible_token/core.rs
@@ -9,7 +9,7 @@ use near_sdk::PromiseOrValue;
 /// # Examples
 ///
 /// ```
-/// use near_sdk::{near, PanicOnDefault, AccountId, PromiseOrValue};
+/// use near_sdk::{near, PanicOnDefault, AccountId, PromiseOrValue, BaseError};
 /// use near_sdk::collections::LazyOption;
 /// use near_sdk::json_types::U128;
 /// use near_contract_standards::fungible_token::{FungibleToken, FungibleTokenCore};
@@ -25,7 +25,7 @@ use near_sdk::PromiseOrValue;
 /// #[near]
 /// impl FungibleTokenCore for Contract {
 ///     #[payable]
-///     fn ft_transfer(&mut self, receiver_id: AccountId, amount: U128, memo: Option<String>) {
+///     fn ft_transfer(&mut self, receiver_id: AccountId, amount: U128, memo: Option<String>) -> Result<(), BaseError> {
 ///         self.token.ft_transfer(receiver_id, amount, memo)
 ///     }
 ///

diff --git a/near-contract-standards/src/fungible_token/resolver.rs b/near-contract-standards/src/fungible_token/resolver.rs
@@ -5,7 +5,7 @@ use near_sdk::{ext_contract, json_types::U128, AccountId, BaseError};
 /// # Examples
 ///
 /// ```
-/// use near_sdk::{near, PanicOnDefault, AccountId, log};
+/// use near_sdk::{near, PanicOnDefault, AccountId, log, unwrap_or_err, BaseError};
 /// use near_sdk::collections::LazyOption;
 /// use near_sdk::json_types::U128;
 /// use near_contract_standards::fungible_token::{FungibleToken, FungibleTokenResolver};
@@ -26,13 +26,13 @@ use near_sdk::{ext_contract, json_types::U128, AccountId, BaseError};
 ///         sender_id: AccountId,
 ///         receiver_id: AccountId,
 ///         amount: U128,
-///     ) -> U128 {
-///         let (used_amount, burned_amount) =
-///             self.token.internal_ft_resolve_transfer(&sender_id, receiver_id, amount);
+///     ) -> Result<U128, BaseError> {
+///         let (used_amount, burned_amount) = unwrap_or_err!(
+///             self.token.internal_ft_resolve_transfer(&sender_id, receiver_id, amount));
 ///         if burned_amount > 0 {
 ///             log!("Account @{} burned {}", sender_id, burned_amount);
 ///         }
-///         used_amount.into()
+///         Ok(used_amount.into())
 ///     }
 /// }
 /// ```

diff --git a/near-contract-standards/src/non_fungible_token/approval/mod.rs b/near-contract-standards/src/non_fungible_token/approval/mod.rs
@@ -20,7 +20,7 @@ use near_sdk::{AccountId, BaseError, Promise};
 ///
 /// ```
 /// use std::collections::HashMap;
-/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near, Promise};
+/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near, Promise, BaseError};
 /// use near_contract_standards::non_fungible_token::{TokenId, NonFungibleToken, NonFungibleTokenApproval};
 ///
 /// #[near(contract_state)]
@@ -32,22 +32,22 @@ use near_sdk::{AccountId, BaseError, Promise};
 /// #[near]
 /// impl NonFungibleTokenApproval for Contract {
 ///     #[payable]
-///     fn nft_approve(&mut self, token_id: TokenId, account_id: AccountId, msg: Option<String>) -> Option<Promise> {
+///     fn nft_approve(&mut self, token_id: TokenId, account_id: AccountId, msg: Option<String>) -> Result<Option<Promise>, BaseError> {
 ///         self.tokens.nft_approve(token_id, account_id, msg)
 ///     }
 ///
 ///     #[payable]
-///     fn nft_revoke(&mut self, token_id: TokenId, account_id: AccountId) {
-///         self.tokens.nft_revoke(token_id, account_id);
+///     fn nft_revoke(&mut self, token_id: TokenId, account_id: AccountId) -> Result<(), BaseError> {
+///         self.tokens.nft_revoke(token_id, account_id)
 ///     }
 ///
 ///     #[payable]
-///     fn nft_revoke_all(&mut self, token_id: TokenId) {
-///         self.tokens.nft_revoke_all(token_id);
+///     fn nft_revoke_all(&mut self, token_id: TokenId) -> Result<(), BaseError> {
+///         self.tokens.nft_revoke_all(token_id)
 ///
 ///     }
 ///
-///     fn nft_is_approved(&self, token_id: TokenId, approved_account_id: AccountId, approval_id: Option<u64>) -> bool {
+///     fn nft_is_approved(&self, token_id: TokenId, approved_account_id: AccountId, approval_id: Option<u64>) -> Result<bool, BaseError> {
 ///         self.tokens.nft_is_approved(token_id, approved_account_id, approval_id)
 ///     }
 /// }

diff --git a/near-contract-standards/src/non_fungible_token/core/mod.rs b/near-contract-standards/src/non_fungible_token/core/mod.rs
@@ -24,7 +24,7 @@ use near_sdk::PromiseOrValue;
 /// # Examples
 ///
 /// ```
-/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near};
+/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near, BaseError};
 /// use near_contract_standards::non_fungible_token::{core::NonFungibleTokenCore, NonFungibleToken, TokenId, Token};
 ///
 /// #[near(contract_state)]
@@ -35,8 +35,8 @@ use near_sdk::PromiseOrValue;
 /// #[near]
 /// impl NonFungibleTokenCore for Contract {
 ///     #[payable]
-///    fn nft_transfer(&mut self, receiver_id: AccountId, token_id: TokenId, approval_id: Option<u64>, memo: Option<String>) {
-///        self.tokens.nft_transfer(receiver_id, token_id, approval_id, memo);
+///    fn nft_transfer(&mut self, receiver_id: AccountId, token_id: TokenId, approval_id: Option<u64>, memo: Option<String>) -> Result<(), BaseError> {
+///        self.tokens.nft_transfer(receiver_id, token_id, approval_id, memo)
 ///    }
 ///
 ///    #[payable]

diff --git a/near-contract-standards/src/non_fungible_token/core/resolver.rs b/near-contract-standards/src/non_fungible_token/core/resolver.rs
@@ -8,7 +8,7 @@ use std::collections::HashMap;
 ///
 /// ```
 /// use std::collections::HashMap;
-/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near};
+/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near, BaseError};
 /// use near_contract_standards::non_fungible_token::{NonFungibleToken, NonFungibleTokenResolver, TokenId};
 ///
 /// #[near(contract_state)]
@@ -19,7 +19,7 @@ use std::collections::HashMap;
 /// #[near]
 /// impl NonFungibleTokenResolver for Contract {
 ///     #[private]
-///     fn nft_resolve_transfer(&mut self, previous_owner_id: AccountId, receiver_id: AccountId, token_id: TokenId, approved_account_ids: Option<HashMap<AccountId, u64>>) -> bool {
+///     fn nft_resolve_transfer(&mut self, previous_owner_id: AccountId, receiver_id: AccountId, token_id: TokenId, approved_account_ids: Option<HashMap<AccountId, u64>>) -> Result<bool, BaseError> {
 ///         self.tokens.nft_resolve_transfer(previous_owner_id, receiver_id, token_id, approved_account_ids)
 ///     }
 /// }

diff --git a/near-contract-standards/src/non_fungible_token/enumeration/mod.rs b/near-contract-standards/src/non_fungible_token/enumeration/mod.rs
@@ -10,7 +10,7 @@ use near_sdk::{AccountId, BaseError};
 ///
 /// ```
 /// use std::collections::HashMap;
-/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near, Promise};
+/// use near_sdk::{PanicOnDefault, AccountId, PromiseOrValue, near, Promise, BaseError};
 /// use near_contract_standards::non_fungible_token::{NonFungibleToken, NonFungibleTokenEnumeration, TokenId, Token};
 /// use near_sdk::json_types::U128;
 ///
@@ -30,11 +30,11 @@ use near_sdk::{AccountId, BaseError};
 ///         self.tokens.nft_tokens(from_index, limit)
 ///     }
 ///
-///     fn nft_supply_for_owner(&self, account_id: AccountId) -> U128 {
+///     fn nft_supply_for_owner(&self, account_id: AccountId) -> Result<U128, BaseError> {
 ///         self.tokens.nft_supply_for_owner(account_id)
 ///     }
 ///
-///     fn nft_tokens_for_owner(&self, account_id: AccountId, from_index: Option<U128>, limit: Option<u64>) -> Vec<Token> {
+///     fn nft_tokens_for_owner(&self, account_id: AccountId, from_index: Option<U128>, limit: Option<u64>) -> Result<Vec<Token>, BaseError> {
 ///         self.tokens.nft_tokens_for_owner(account_id, from_index, limit)
 ///     }
 /// }

diff --git a/near-contract-standards/src/storage_management/mod.rs b/near-contract-standards/src/storage_management/mod.rs
@@ -21,7 +21,7 @@ pub struct StorageBalanceBounds {
 /// # Examples
 ///
 /// ```
-/// use near_sdk::{near, PanicOnDefault, AccountId, NearToken, log};
+/// use near_sdk::{near, PanicOnDefault, AccountId, NearToken, log, unwrap_or_err, BaseError};
 /// use near_sdk::collections::LazyOption;
 /// use near_sdk::json_types::U128;
 /// use near_contract_standards::fungible_token::FungibleToken;
@@ -44,23 +44,23 @@ pub struct StorageBalanceBounds {
 ///         &mut self,
 ///         account_id: Option<AccountId>,
 ///         registration_only: Option<bool>,
-///     ) -> StorageBalance {
+///     ) -> Result<StorageBalance, BaseError> {
 ///         self.token.storage_deposit(account_id, registration_only)
 ///     }
 ///
 ///     #[payable]
-///     fn storage_withdraw(&mut self, amount: Option<NearToken>) -> StorageBalance {
+///     fn storage_withdraw(&mut self, amount: Option<NearToken>) -> Result<StorageBalance, BaseError> {
 ///         self.token.storage_withdraw(amount)
 ///     }
 ///
 ///     #[payable]
-///     fn storage_unregister(&mut self, force: Option<bool>) -> bool {
+///     fn storage_unregister(&mut self, force: Option<bool>) -> Result<bool, BaseError> {
 ///         #[allow(unused_variables)]
-///         if let Some((account_id, balance)) = self.token.internal_storage_unregister(force) {
+///         if let Some((account_id, balance)) = unwrap_or_err!(self.token.internal_storage_unregister(force)) {
 ///             log!("Closed @{} with {}", account_id, balance);
-///             true
+///             Ok(true)
 ///         } else {
-///             false
+///             Ok(false)
 ///         }
 ///     }
 ///