git.delta.rocks / unique-network / refs/commits / dd8998750d8f

difftreelog

Apply suggestions from code review

Yaroslav Bolyukin2022-07-22parent: #94da15a.patch.diff
in: master

7 files changed

modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -364,7 +364,7 @@
 
 	/// Returns 10 tokens owners in no particular order.
 	fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
-		<Pallet<T>>::token_owners(self.id, token).unwrap_or_else(|| vec![])
+		<Pallet<T>>::token_owners(self.id, token).unwrap_or_default()
 	}
 
 	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -629,7 +629,7 @@
 			.take(10)
 			.collect();
 
-		if res.len() == 0 {
+		if res.is_empty() {
 			None
 		} else {
 			Some(res)
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -440,7 +440,7 @@
 
 	/// Returns 10 token in no particular order.
 	fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
-		<Pallet<T>>::token_owners(self.id, token).unwrap_or_else(|| vec![])
+		<Pallet<T>>::token_owners(self.id, token).unwrap_or_default()
 	}
 
 	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -1150,7 +1150,7 @@
 			.take(10)
 			.collect();
 
-		if res.len() == 0 {
+		if res.is_empty() {
 			None
 		} else {
 			Some(res)
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
before · primitives/rpc/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use up_data_structs::{20	CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,21	PropertyKeyPermission, TokenData, TokenChild,22};23use sp_std::vec::Vec;24use codec::Decode;25use sp_runtime::DispatchError;2627type Result<T> = core::result::Result<T, DispatchError>;2829sp_api::decl_runtime_apis! {30	#[api_version(2)]31	pub trait UniqueApi<CrossAccountId, AccountId> where32		AccountId: Decode,33		CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,34	{35		#[changed_in(2)]36		fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;3738		fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;39		fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>>;40		fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;4142		fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;43		fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;44		fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>>;4546		fn collection_properties(collection: CollectionId, properties: Option<Vec<Vec<u8>>>) -> Result<Vec<Property>>;4748		fn token_properties(49			collection: CollectionId,50			token_id: TokenId,51			properties: Option<Vec<Vec<u8>>>52		) -> Result<Vec<Property>>;5354		fn property_permissions(55			collection: CollectionId,56			properties: Option<Vec<Vec<u8>>>57		) -> Result<Vec<PropertyKeyPermission>>;5859		fn token_data(60			collection: CollectionId,61			token_id: TokenId,62			keys: Option<Vec<Vec<u8>>>63		) -> Result<TokenData<CrossAccountId>>;6465		fn total_supply(collection: CollectionId) -> Result<u32>;66		fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;67		fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;68		fn allowance(69			collection: CollectionId,70			sender: CrossAccountId,71			spender: CrossAccountId,72			token: TokenId,73		) -> Result<u128>;7475		fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;76		fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;77		fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool>;78		fn last_token_id(collection: CollectionId) -> Result<TokenId>;79		fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;80		fn collection_stats() -> Result<CollectionStats>;81		fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;82		fn effective_collection_limits(collection_id: CollectionId) -> Result<Option<CollectionLimits>>;83		fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Result<Option<u128>>;84		fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec::<CrossAccountId>>;85	}86}
after · primitives/rpc/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use up_data_structs::{20	CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,21	PropertyKeyPermission, TokenData, TokenChild,22};23use sp_std::vec::Vec;24use codec::Decode;25use sp_runtime::DispatchError;2627type Result<T> = core::result::Result<T, DispatchError>;2829sp_api::decl_runtime_apis! {30	#[api_version(2)]31	pub trait UniqueApi<CrossAccountId, AccountId> where32		AccountId: Decode,33		CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,34	{35		#[changed_in(2)]36		fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;3738		fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;39		fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>>;40		fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;4142		fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;43		fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;44		fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>>;4546		fn collection_properties(collection: CollectionId, properties: Option<Vec<Vec<u8>>>) -> Result<Vec<Property>>;4748		fn token_properties(49			collection: CollectionId,50			token_id: TokenId,51			properties: Option<Vec<Vec<u8>>>52		) -> Result<Vec<Property>>;5354		fn property_permissions(55			collection: CollectionId,56			properties: Option<Vec<Vec<u8>>>57		) -> Result<Vec<PropertyKeyPermission>>;5859		fn token_data(60			collection: CollectionId,61			token_id: TokenId,62			keys: Option<Vec<Vec<u8>>>63		) -> Result<TokenData<CrossAccountId>>;6465		fn total_supply(collection: CollectionId) -> Result<u32>;66		fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;67		fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;68		fn allowance(69			collection: CollectionId,70			sender: CrossAccountId,71			spender: CrossAccountId,72			token: TokenId,73		) -> Result<u128>;7475		fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;76		fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;77		fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool>;78		fn last_token_id(collection: CollectionId) -> Result<TokenId>;79		fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;80		fn collection_stats() -> Result<CollectionStats>;81		fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;82		fn effective_collection_limits(collection_id: CollectionId) -> Result<Option<CollectionLimits>>;83		fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Result<Option<u128>>;84		fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec<CrossAccountId>>;85	}86}
modifiedtests/src/refungible.test.tsdiffbeforeafterboth
--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -100,7 +100,7 @@
       // What to expect
       // tslint:disable-next-line:no-unused-expression
       expect(ids).to.deep.include.members([aliceID, ethAcc, bobId, ...facelessCrowd]);
-      expect(owners.length == 10).to.be.true;
+      expect(owners.length).to.be.equal(10);
       
       const eleven = privateKeyWrapper('11');
       expect(await transfer(api, collectionId, aliceTokenId, alice, eleven, 10n)).to.be.true;
modifiedtests/src/rpc.test.tsdiffbeforeafterboth
--- a/tests/src/rpc.test.ts
+++ b/tests/src/rpc.test.ts
@@ -23,7 +23,7 @@
     });
   });
   
-  it('RPC method tokenOnewrs for fungible collection and token', async () => {
+  it('RPC method tokenOwners for fungible collection and token', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
       const facelessCrowd = Array.from(Array(7).keys()).map(i => normalizeAccountId(privateKeyWrapper(i.toString())));