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
before · pallets/fungible/src/common.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/>.1617use core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};20use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};22use pallet_structure::Error as StructureError;23use sp_runtime::ArithmeticError;24use sp_std::{vec::Vec, vec};25use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};2627use crate::{28	Allowance, TotalSupply, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf,29	weights::WeightInfo,30};3132pub struct CommonWeights<T: Config>(PhantomData<T>);33impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {34	fn create_item() -> Weight {35		<SelfWeightOf<T>>::create_item()36	}3738	fn create_multiple_items(_data: &[CreateItemData]) -> Weight {39		// All items minted for the same user, so it works same as create_item40		Self::create_item()41	}4243	fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {44		match data {45			CreateItemExData::Fungible(f) => {46				<SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)47			}48			_ => 0,49		}50	}5152	fn burn_item() -> Weight {53		<SelfWeightOf<T>>::burn_item()54	}5556	fn set_collection_properties(_amount: u32) -> Weight {57		// Error58		059	}6061	fn delete_collection_properties(_amount: u32) -> Weight {62		// Error63		064	}6566	fn set_token_properties(_amount: u32) -> Weight {67		// Error68		069	}7071	fn delete_token_properties(_amount: u32) -> Weight {72		// Error73		074	}7576	fn set_token_property_permissions(_amount: u32) -> Weight {77		// Error78		079	}8081	fn transfer() -> Weight {82		<SelfWeightOf<T>>::transfer()83	}8485	fn approve() -> Weight {86		<SelfWeightOf<T>>::approve()87	}8889	fn transfer_from() -> Weight {90		<SelfWeightOf<T>>::transfer_from()91	}9293	fn burn_from() -> Weight {94		<SelfWeightOf<T>>::burn_from()95	}9697	fn burn_recursively_self_raw() -> Weight {98		// Read to get total balance99		Self::burn_item() + T::DbWeight::get().reads(1)100	}101102	fn burn_recursively_breadth_raw(_amount: u32) -> Weight {103		// Fungible tokens can't have children104		0105	}106}107108/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete109/// methods and adds weight info.110impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {111	fn create_item(112		&self,113		sender: T::CrossAccountId,114		to: T::CrossAccountId,115		data: up_data_structs::CreateItemData,116		nesting_budget: &dyn Budget,117	) -> DispatchResultWithPostInfo {118		match data {119			up_data_structs::CreateItemData::Fungible(data) => with_weight(120				<Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),121				<CommonWeights<T>>::create_item(),122			),123			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),124		}125	}126127	fn create_multiple_items(128		&self,129		sender: T::CrossAccountId,130		to: T::CrossAccountId,131		data: Vec<up_data_structs::CreateItemData>,132		nesting_budget: &dyn Budget,133	) -> DispatchResultWithPostInfo {134		let mut sum: u128 = 0;135		for data in data {136			match data {137				up_data_structs::CreateItemData::Fungible(data) => {138					sum = sum139						.checked_add(data.value)140						.ok_or(ArithmeticError::Overflow)?;141				}142				_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),143			}144		}145146		with_weight(147			<Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),148			<CommonWeights<T>>::create_item(),149		)150	}151152	fn create_multiple_items_ex(153		&self,154		sender: <T>::CrossAccountId,155		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,156		nesting_budget: &dyn Budget,157	) -> DispatchResultWithPostInfo {158		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);159		let data = match data {160			up_data_structs::CreateItemExData::Fungible(f) => f,161			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),162		};163164		with_weight(165			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),166			weight,167		)168	}169170	fn burn_item(171		&self,172		sender: T::CrossAccountId,173		token: TokenId,174		amount: u128,175	) -> DispatchResultWithPostInfo {176		ensure!(177			token == TokenId::default(),178			<Error<T>>::FungibleItemsHaveNoId179		);180181		with_weight(182			<Pallet<T>>::burn(self, &sender, amount),183			<CommonWeights<T>>::burn_item(),184		)185	}186187	fn burn_item_recursively(188		&self,189		sender: T::CrossAccountId,190		token: TokenId,191		self_budget: &dyn Budget,192		_breadth_budget: &dyn Budget,193	) -> DispatchResultWithPostInfo {194		// Should not happen?195		ensure!(196			token == TokenId::default(),197			<Error<T>>::FungibleItemsHaveNoId198		);199		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);200201		with_weight(202			<Pallet<T>>::burn(self, &sender, <Balance<T>>::get((self.id, &sender))),203			<CommonWeights<T>>::burn_recursively_self_raw(),204		)205	}206207	fn transfer(208		&self,209		from: T::CrossAccountId,210		to: T::CrossAccountId,211		token: TokenId,212		amount: u128,213		nesting_budget: &dyn Budget,214	) -> DispatchResultWithPostInfo {215		ensure!(216			token == TokenId::default(),217			<Error<T>>::FungibleItemsHaveNoId218		);219220		with_weight(221			<Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),222			<CommonWeights<T>>::transfer(),223		)224	}225226	fn approve(227		&self,228		sender: T::CrossAccountId,229		spender: T::CrossAccountId,230		token: TokenId,231		amount: u128,232	) -> DispatchResultWithPostInfo {233		ensure!(234			token == TokenId::default(),235			<Error<T>>::FungibleItemsHaveNoId236		);237238		with_weight(239			<Pallet<T>>::set_allowance(self, &sender, &spender, amount),240			<CommonWeights<T>>::approve(),241		)242	}243244	fn transfer_from(245		&self,246		sender: T::CrossAccountId,247		from: T::CrossAccountId,248		to: T::CrossAccountId,249		token: TokenId,250		amount: u128,251		nesting_budget: &dyn Budget,252	) -> DispatchResultWithPostInfo {253		ensure!(254			token == TokenId::default(),255			<Error<T>>::FungibleItemsHaveNoId256		);257258		with_weight(259			<Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),260			<CommonWeights<T>>::transfer_from(),261		)262	}263264	fn burn_from(265		&self,266		sender: T::CrossAccountId,267		from: T::CrossAccountId,268		token: TokenId,269		amount: u128,270		nesting_budget: &dyn Budget,271	) -> DispatchResultWithPostInfo {272		ensure!(273			token == TokenId::default(),274			<Error<T>>::FungibleItemsHaveNoId275		);276277		with_weight(278			<Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),279			<CommonWeights<T>>::burn_from(),280		)281	}282283	fn set_collection_properties(284		&self,285		_sender: T::CrossAccountId,286		_property: Vec<Property>,287	) -> DispatchResultWithPostInfo {288		fail!(<Error<T>>::SettingPropertiesNotAllowed)289	}290291	fn delete_collection_properties(292		&self,293		_sender: &T::CrossAccountId,294		_property_keys: Vec<PropertyKey>,295	) -> DispatchResultWithPostInfo {296		fail!(<Error<T>>::SettingPropertiesNotAllowed)297	}298299	fn set_token_properties(300		&self,301		_sender: T::CrossAccountId,302		_token_id: TokenId,303		_property: Vec<Property>,304		_nesting_budget: &dyn Budget,305	) -> DispatchResultWithPostInfo {306		fail!(<Error<T>>::SettingPropertiesNotAllowed)307	}308309	fn set_token_property_permissions(310		&self,311		_sender: &T::CrossAccountId,312		_property_permissions: Vec<PropertyKeyPermission>,313	) -> DispatchResultWithPostInfo {314		fail!(<Error<T>>::SettingPropertiesNotAllowed)315	}316317	fn delete_token_properties(318		&self,319		_sender: T::CrossAccountId,320		_token_id: TokenId,321		_property_keys: Vec<PropertyKey>,322		_nesting_budget: &dyn Budget,323	) -> DispatchResultWithPostInfo {324		fail!(<Error<T>>::SettingPropertiesNotAllowed)325	}326327	fn check_nesting(328		&self,329		_sender: <T>::CrossAccountId,330		_from: (CollectionId, TokenId),331		_under: TokenId,332		_nesting_budget: &dyn Budget,333	) -> sp_runtime::DispatchResult {334		fail!(<Error<T>>::FungibleDisallowsNesting)335	}336337	fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}338339	fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}340341	fn collection_tokens(&self) -> Vec<TokenId> {342		vec![TokenId::default()]343	}344345	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {346		if <Balance<T>>::get((self.id, account)) != 0 {347			vec![TokenId::default()]348		} else {349			vec![]350		}351	}352353	fn token_exists(&self, token: TokenId) -> bool {354		token == TokenId::default()355	}356357	fn last_token_id(&self) -> TokenId {358		TokenId::default()359	}360361	fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {362		None363	}364365	/// Returns 10 tokens owners in no particular order.366	fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {367		<Pallet<T>>::token_owners(self.id, token).unwrap_or_else(|| vec![])368	}369370	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {371		None372	}373374	fn token_properties(375		&self,376		_token_id: TokenId,377		_keys: Option<Vec<PropertyKey>>,378	) -> Vec<Property> {379		Vec::new()380	}381382	fn total_supply(&self) -> u32 {383		1384	}385386	fn account_balance(&self, account: T::CrossAccountId) -> u32 {387		if <Balance<T>>::get((self.id, account)) != 0 {388			1389		} else {390			0391		}392	}393394	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {395		if token != TokenId::default() {396			return 0;397		}398		<Balance<T>>::get((self.id, account))399	}400401	fn allowance(402		&self,403		sender: T::CrossAccountId,404		spender: T::CrossAccountId,405		token: TokenId,406	) -> u128 {407		if token != TokenId::default() {408			return 0;409		}410		<Allowance<T>>::get((self.id, sender, spender))411	}412413	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {414		None415	}416417	fn total_pieces(&self, token: TokenId) -> Option<u128> {418		if token != TokenId::default() {419			return None;420		}421		<TotalSupply<T>>::try_get(self.id).ok()422	}423}
after · pallets/fungible/src/common.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/>.1617use core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};20use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};22use pallet_structure::Error as StructureError;23use sp_runtime::ArithmeticError;24use sp_std::{vec::Vec, vec};25use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};2627use crate::{28	Allowance, TotalSupply, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf,29	weights::WeightInfo,30};3132pub struct CommonWeights<T: Config>(PhantomData<T>);33impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {34	fn create_item() -> Weight {35		<SelfWeightOf<T>>::create_item()36	}3738	fn create_multiple_items(_data: &[CreateItemData]) -> Weight {39		// All items minted for the same user, so it works same as create_item40		Self::create_item()41	}4243	fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {44		match data {45			CreateItemExData::Fungible(f) => {46				<SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)47			}48			_ => 0,49		}50	}5152	fn burn_item() -> Weight {53		<SelfWeightOf<T>>::burn_item()54	}5556	fn set_collection_properties(_amount: u32) -> Weight {57		// Error58		059	}6061	fn delete_collection_properties(_amount: u32) -> Weight {62		// Error63		064	}6566	fn set_token_properties(_amount: u32) -> Weight {67		// Error68		069	}7071	fn delete_token_properties(_amount: u32) -> Weight {72		// Error73		074	}7576	fn set_token_property_permissions(_amount: u32) -> Weight {77		// Error78		079	}8081	fn transfer() -> Weight {82		<SelfWeightOf<T>>::transfer()83	}8485	fn approve() -> Weight {86		<SelfWeightOf<T>>::approve()87	}8889	fn transfer_from() -> Weight {90		<SelfWeightOf<T>>::transfer_from()91	}9293	fn burn_from() -> Weight {94		<SelfWeightOf<T>>::burn_from()95	}9697	fn burn_recursively_self_raw() -> Weight {98		// Read to get total balance99		Self::burn_item() + T::DbWeight::get().reads(1)100	}101102	fn burn_recursively_breadth_raw(_amount: u32) -> Weight {103		// Fungible tokens can't have children104		0105	}106}107108/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete109/// methods and adds weight info.110impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {111	fn create_item(112		&self,113		sender: T::CrossAccountId,114		to: T::CrossAccountId,115		data: up_data_structs::CreateItemData,116		nesting_budget: &dyn Budget,117	) -> DispatchResultWithPostInfo {118		match data {119			up_data_structs::CreateItemData::Fungible(data) => with_weight(120				<Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),121				<CommonWeights<T>>::create_item(),122			),123			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),124		}125	}126127	fn create_multiple_items(128		&self,129		sender: T::CrossAccountId,130		to: T::CrossAccountId,131		data: Vec<up_data_structs::CreateItemData>,132		nesting_budget: &dyn Budget,133	) -> DispatchResultWithPostInfo {134		let mut sum: u128 = 0;135		for data in data {136			match data {137				up_data_structs::CreateItemData::Fungible(data) => {138					sum = sum139						.checked_add(data.value)140						.ok_or(ArithmeticError::Overflow)?;141				}142				_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),143			}144		}145146		with_weight(147			<Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),148			<CommonWeights<T>>::create_item(),149		)150	}151152	fn create_multiple_items_ex(153		&self,154		sender: <T>::CrossAccountId,155		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,156		nesting_budget: &dyn Budget,157	) -> DispatchResultWithPostInfo {158		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);159		let data = match data {160			up_data_structs::CreateItemExData::Fungible(f) => f,161			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),162		};163164		with_weight(165			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),166			weight,167		)168	}169170	fn burn_item(171		&self,172		sender: T::CrossAccountId,173		token: TokenId,174		amount: u128,175	) -> DispatchResultWithPostInfo {176		ensure!(177			token == TokenId::default(),178			<Error<T>>::FungibleItemsHaveNoId179		);180181		with_weight(182			<Pallet<T>>::burn(self, &sender, amount),183			<CommonWeights<T>>::burn_item(),184		)185	}186187	fn burn_item_recursively(188		&self,189		sender: T::CrossAccountId,190		token: TokenId,191		self_budget: &dyn Budget,192		_breadth_budget: &dyn Budget,193	) -> DispatchResultWithPostInfo {194		// Should not happen?195		ensure!(196			token == TokenId::default(),197			<Error<T>>::FungibleItemsHaveNoId198		);199		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);200201		with_weight(202			<Pallet<T>>::burn(self, &sender, <Balance<T>>::get((self.id, &sender))),203			<CommonWeights<T>>::burn_recursively_self_raw(),204		)205	}206207	fn transfer(208		&self,209		from: T::CrossAccountId,210		to: T::CrossAccountId,211		token: TokenId,212		amount: u128,213		nesting_budget: &dyn Budget,214	) -> DispatchResultWithPostInfo {215		ensure!(216			token == TokenId::default(),217			<Error<T>>::FungibleItemsHaveNoId218		);219220		with_weight(221			<Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),222			<CommonWeights<T>>::transfer(),223		)224	}225226	fn approve(227		&self,228		sender: T::CrossAccountId,229		spender: T::CrossAccountId,230		token: TokenId,231		amount: u128,232	) -> DispatchResultWithPostInfo {233		ensure!(234			token == TokenId::default(),235			<Error<T>>::FungibleItemsHaveNoId236		);237238		with_weight(239			<Pallet<T>>::set_allowance(self, &sender, &spender, amount),240			<CommonWeights<T>>::approve(),241		)242	}243244	fn transfer_from(245		&self,246		sender: T::CrossAccountId,247		from: T::CrossAccountId,248		to: T::CrossAccountId,249		token: TokenId,250		amount: u128,251		nesting_budget: &dyn Budget,252	) -> DispatchResultWithPostInfo {253		ensure!(254			token == TokenId::default(),255			<Error<T>>::FungibleItemsHaveNoId256		);257258		with_weight(259			<Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),260			<CommonWeights<T>>::transfer_from(),261		)262	}263264	fn burn_from(265		&self,266		sender: T::CrossAccountId,267		from: T::CrossAccountId,268		token: TokenId,269		amount: u128,270		nesting_budget: &dyn Budget,271	) -> DispatchResultWithPostInfo {272		ensure!(273			token == TokenId::default(),274			<Error<T>>::FungibleItemsHaveNoId275		);276277		with_weight(278			<Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),279			<CommonWeights<T>>::burn_from(),280		)281	}282283	fn set_collection_properties(284		&self,285		_sender: T::CrossAccountId,286		_property: Vec<Property>,287	) -> DispatchResultWithPostInfo {288		fail!(<Error<T>>::SettingPropertiesNotAllowed)289	}290291	fn delete_collection_properties(292		&self,293		_sender: &T::CrossAccountId,294		_property_keys: Vec<PropertyKey>,295	) -> DispatchResultWithPostInfo {296		fail!(<Error<T>>::SettingPropertiesNotAllowed)297	}298299	fn set_token_properties(300		&self,301		_sender: T::CrossAccountId,302		_token_id: TokenId,303		_property: Vec<Property>,304		_nesting_budget: &dyn Budget,305	) -> DispatchResultWithPostInfo {306		fail!(<Error<T>>::SettingPropertiesNotAllowed)307	}308309	fn set_token_property_permissions(310		&self,311		_sender: &T::CrossAccountId,312		_property_permissions: Vec<PropertyKeyPermission>,313	) -> DispatchResultWithPostInfo {314		fail!(<Error<T>>::SettingPropertiesNotAllowed)315	}316317	fn delete_token_properties(318		&self,319		_sender: T::CrossAccountId,320		_token_id: TokenId,321		_property_keys: Vec<PropertyKey>,322		_nesting_budget: &dyn Budget,323	) -> DispatchResultWithPostInfo {324		fail!(<Error<T>>::SettingPropertiesNotAllowed)325	}326327	fn check_nesting(328		&self,329		_sender: <T>::CrossAccountId,330		_from: (CollectionId, TokenId),331		_under: TokenId,332		_nesting_budget: &dyn Budget,333	) -> sp_runtime::DispatchResult {334		fail!(<Error<T>>::FungibleDisallowsNesting)335	}336337	fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}338339	fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}340341	fn collection_tokens(&self) -> Vec<TokenId> {342		vec![TokenId::default()]343	}344345	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {346		if <Balance<T>>::get((self.id, account)) != 0 {347			vec![TokenId::default()]348		} else {349			vec![]350		}351	}352353	fn token_exists(&self, token: TokenId) -> bool {354		token == TokenId::default()355	}356357	fn last_token_id(&self) -> TokenId {358		TokenId::default()359	}360361	fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {362		None363	}364365	/// Returns 10 tokens owners in no particular order.366	fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {367		<Pallet<T>>::token_owners(self.id, token).unwrap_or_default()368	}369370	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {371		None372	}373374	fn token_properties(375		&self,376		_token_id: TokenId,377		_keys: Option<Vec<PropertyKey>>,378	) -> Vec<Property> {379		Vec::new()380	}381382	fn total_supply(&self) -> u32 {383		1384	}385386	fn account_balance(&self, account: T::CrossAccountId) -> u32 {387		if <Balance<T>>::get((self.id, account)) != 0 {388			1389		} else {390			0391		}392	}393394	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {395		if token != TokenId::default() {396			return 0;397		}398		<Balance<T>>::get((self.id, account))399	}400401	fn allowance(402		&self,403		sender: T::CrossAccountId,404		spender: T::CrossAccountId,405		token: TokenId,406	) -> u128 {407		if token != TokenId::default() {408			return 0;409		}410		<Allowance<T>>::get((self.id, sender, spender))411	}412413	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {414		None415	}416417	fn total_pieces(&self, token: TokenId) -> Option<u128> {418		if token != TokenId::default() {419			return None;420		}421		<TotalSupply<T>>::try_get(self.id).ok()422	}423}
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
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -81,6 +81,6 @@
 		fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;
 		fn effective_collection_limits(collection_id: CollectionId) -> Result<Option<CollectionLimits>>;
 		fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Result<Option<u128>>;
-		fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec::<CrossAccountId>>;
+		fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec<CrossAccountId>>;
 	}
 }
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())));