git.delta.rocks / unique-network / refs/commits / 88ef7226e031

difftreelog

Test all collection for total_pieces

Trubnikov Sergey2022-06-30parent: #2d796da.patch.diff
in: master

10 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -198,7 +198,7 @@
 		collection_id: CollectionId,
 		token_id: TokenId,
 		at: Option<BlockHash>,
-	) -> Result<u128>;
+	) -> Result<Option<u128>>;
 }
 
 mod rmrk_unique_rpc {
@@ -472,7 +472,7 @@
 	pass_method!(collection_stats() -> CollectionStats, unique_api);
 	pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);
 	pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);
-	pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> u128, unique_api);
+	pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128>, unique_api);
 }
 
 #[allow(deprecated)]
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1383,7 +1383,7 @@
 	/// Amount of specific token account have (Applicable to fungible/refungible)
 	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;
 	/// Amount of token pieces
-	fn total_pieces(&self, token: TokenId) -> u128;
+	fn total_pieces(&self, token: TokenId) -> Option<u128>;
 	fn allowance(
 		&self,
 		sender: T::CrossAccountId,
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
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}107108impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {109	fn create_item(110		&self,111		sender: T::CrossAccountId,112		to: T::CrossAccountId,113		data: up_data_structs::CreateItemData,114		nesting_budget: &dyn Budget,115	) -> DispatchResultWithPostInfo {116		match data {117			up_data_structs::CreateItemData::Fungible(data) => with_weight(118				<Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),119				<CommonWeights<T>>::create_item(),120			),121			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),122		}123	}124125	fn create_multiple_items(126		&self,127		sender: T::CrossAccountId,128		to: T::CrossAccountId,129		data: Vec<up_data_structs::CreateItemData>,130		nesting_budget: &dyn Budget,131	) -> DispatchResultWithPostInfo {132		let mut sum: u128 = 0;133		for data in data {134			match data {135				up_data_structs::CreateItemData::Fungible(data) => {136					sum = sum137						.checked_add(data.value)138						.ok_or(ArithmeticError::Overflow)?;139				}140				_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),141			}142		}143144		with_weight(145			<Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),146			<CommonWeights<T>>::create_item(),147		)148	}149150	fn create_multiple_items_ex(151		&self,152		sender: <T>::CrossAccountId,153		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,154		nesting_budget: &dyn Budget,155	) -> DispatchResultWithPostInfo {156		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);157		let data = match data {158			up_data_structs::CreateItemExData::Fungible(f) => f,159			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),160		};161162		with_weight(163			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),164			weight,165		)166	}167168	fn burn_item(169		&self,170		sender: T::CrossAccountId,171		token: TokenId,172		amount: u128,173	) -> DispatchResultWithPostInfo {174		ensure!(175			token == TokenId::default(),176			<Error<T>>::FungibleItemsHaveNoId177		);178179		with_weight(180			<Pallet<T>>::burn(self, &sender, amount),181			<CommonWeights<T>>::burn_item(),182		)183	}184185	fn burn_item_recursively(186		&self,187		sender: T::CrossAccountId,188		token: TokenId,189		self_budget: &dyn Budget,190		_breadth_budget: &dyn Budget,191	) -> DispatchResultWithPostInfo {192		// Should not happen?193		ensure!(194			token == TokenId::default(),195			<Error<T>>::FungibleItemsHaveNoId196		);197		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);198199		with_weight(200			<Pallet<T>>::burn(self, &sender, <Balance<T>>::get((self.id, &sender))),201			<CommonWeights<T>>::burn_recursively_self_raw(),202		)203	}204205	fn transfer(206		&self,207		from: T::CrossAccountId,208		to: T::CrossAccountId,209		token: TokenId,210		amount: u128,211		nesting_budget: &dyn Budget,212	) -> DispatchResultWithPostInfo {213		ensure!(214			token == TokenId::default(),215			<Error<T>>::FungibleItemsHaveNoId216		);217218		with_weight(219			<Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),220			<CommonWeights<T>>::transfer(),221		)222	}223224	fn approve(225		&self,226		sender: T::CrossAccountId,227		spender: T::CrossAccountId,228		token: TokenId,229		amount: u128,230	) -> DispatchResultWithPostInfo {231		ensure!(232			token == TokenId::default(),233			<Error<T>>::FungibleItemsHaveNoId234		);235236		with_weight(237			<Pallet<T>>::set_allowance(self, &sender, &spender, amount),238			<CommonWeights<T>>::approve(),239		)240	}241242	fn transfer_from(243		&self,244		sender: T::CrossAccountId,245		from: T::CrossAccountId,246		to: T::CrossAccountId,247		token: TokenId,248		amount: u128,249		nesting_budget: &dyn Budget,250	) -> DispatchResultWithPostInfo {251		ensure!(252			token == TokenId::default(),253			<Error<T>>::FungibleItemsHaveNoId254		);255256		with_weight(257			<Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),258			<CommonWeights<T>>::transfer_from(),259		)260	}261262	fn burn_from(263		&self,264		sender: T::CrossAccountId,265		from: T::CrossAccountId,266		token: TokenId,267		amount: u128,268		nesting_budget: &dyn Budget,269	) -> DispatchResultWithPostInfo {270		ensure!(271			token == TokenId::default(),272			<Error<T>>::FungibleItemsHaveNoId273		);274275		with_weight(276			<Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),277			<CommonWeights<T>>::burn_from(),278		)279	}280281	fn set_collection_properties(282		&self,283		_sender: T::CrossAccountId,284		_property: Vec<Property>,285	) -> DispatchResultWithPostInfo {286		fail!(<Error<T>>::SettingPropertiesNotAllowed)287	}288289	fn delete_collection_properties(290		&self,291		_sender: &T::CrossAccountId,292		_property_keys: Vec<PropertyKey>,293	) -> DispatchResultWithPostInfo {294		fail!(<Error<T>>::SettingPropertiesNotAllowed)295	}296297	fn set_token_properties(298		&self,299		_sender: T::CrossAccountId,300		_token_id: TokenId,301		_property: Vec<Property>,302	) -> DispatchResultWithPostInfo {303		fail!(<Error<T>>::SettingPropertiesNotAllowed)304	}305306	fn set_token_property_permissions(307		&self,308		_sender: &T::CrossAccountId,309		_property_permissions: Vec<PropertyKeyPermission>,310	) -> DispatchResultWithPostInfo {311		fail!(<Error<T>>::SettingPropertiesNotAllowed)312	}313314	fn delete_token_properties(315		&self,316		_sender: T::CrossAccountId,317		_token_id: TokenId,318		_property_keys: Vec<PropertyKey>,319	) -> DispatchResultWithPostInfo {320		fail!(<Error<T>>::SettingPropertiesNotAllowed)321	}322323	fn check_nesting(324		&self,325		_sender: <T>::CrossAccountId,326		_from: (CollectionId, TokenId),327		_under: TokenId,328		_budget: &dyn Budget,329	) -> sp_runtime::DispatchResult {330		fail!(<Error<T>>::FungibleDisallowsNesting)331	}332333	fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}334335	fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}336337	fn collection_tokens(&self) -> Vec<TokenId> {338		vec![TokenId::default()]339	}340341	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {342		if <Balance<T>>::get((self.id, account)) != 0 {343			vec![TokenId::default()]344		} else {345			vec![]346		}347	}348349	fn token_exists(&self, token: TokenId) -> bool {350		token == TokenId::default()351	}352353	fn last_token_id(&self) -> TokenId {354		TokenId::default()355	}356357	fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {358		None359	}360361	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {362		None363	}364365	fn token_properties(366		&self,367		_token_id: TokenId,368		_keys: Option<Vec<PropertyKey>>,369	) -> Vec<Property> {370		Vec::new()371	}372373	fn total_supply(&self) -> u32 {374		1375	}376377	fn account_balance(&self, account: T::CrossAccountId) -> u32 {378		if <Balance<T>>::get((self.id, account)) != 0 {379			1380		} else {381			0382		}383	}384385	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {386		if token != TokenId::default() {387			return 0;388		}389		<Balance<T>>::get((self.id, account))390	}391392	fn allowance(393		&self,394		sender: T::CrossAccountId,395		spender: T::CrossAccountId,396		token: TokenId,397	) -> u128 {398		if token != TokenId::default() {399			return 0;400		}401		<Allowance<T>>::get((self.id, sender, spender))402	}403404	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {405		None406	}407408	fn total_pieces(&self, token: TokenId) -> Option<u128> {409		if token != TokenId::default() {410			return None;411		}412		<TotalSupply<T>>::try_get(self.id).ok()413	}414}
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -473,7 +473,7 @@
 		None
 	}
 
-	fn total_pieces(&self, _token: TokenId) -> u128 {
-		1
+	fn total_pieces(&self, _token: TokenId) -> Option<u128> {
+		Some(1)
 	}
 }
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -410,7 +410,7 @@
 		Some(self)
 	}
 
-	fn total_pieces(&self, token: TokenId) -> u128 {
+	fn total_pieces(&self, token: TokenId) -> Option<u128> {
 		<Pallet<T>>::total_pieces(self.id, token)
 	}
 }
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -711,7 +711,7 @@
 		Ok(())
 	}
 
-	fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> u128 {
-		<TotalSupply<T>>::get((collection_id, token_id))
+	fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {
+		<TotalSupply<T>>::try_get((collection_id, token_id)).ok()
 	}
 }
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -80,6 +80,6 @@
 		fn collection_stats() -> Result<CollectionStats>;
 		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<u128>;
+		fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Result<Option<u128>>;
 	}
 }
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -143,7 +143,7 @@
                     Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))
                 }
 
-                fn total_pieces(collection: CollectionId, token_id: TokenId) -> Result<u128, DispatchError> {
+                fn total_pieces(collection: CollectionId, token_id: TokenId) -> Result<Option<u128>, DispatchError> {
                     dispatch_unique_runtime!(collection.total_pieces(token_id))
                 }
             }
modifiedtests/src/createItem.test.tsdiffbeforeafterboth
--- a/tests/src/createItem.test.ts
+++ b/tests/src/createItem.test.ts
@@ -24,6 +24,8 @@
   createCollectionWithPropsExpectSuccess,
   createItemWithPropsExpectSuccess,
   createItemWithPropsExpectFailure,
+  createCollection,
+  transferExpectSuccess,
 } from './util/helpers';
 
 const expect = chai.expect;
@@ -95,6 +97,68 @@
     
     await createItemWithPropsExpectSuccess(alice, newCollectionID, createMode, [{key: 'key1', value: 'val1'}]);
   });
+
+  it.only('Check total pieces of Fungible token', async () => {
+    await usingApi(async api => {
+      const createMode = 'Fungible';
+      const collectionId = await createCollectionExpectSuccess({mode: {type: createMode, decimalPoints: 0}});
+      const tokenId = await createItemExpectSuccess(alice, collectionId, createMode, bob.address);
+      {
+        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
+        expect(totalPieces.isSome).to.be.true;
+        expect(totalPieces.unwrap().toBigInt()).to.be.eq(10n);
+      }
+
+      await transferExpectSuccess(collectionId, tokenId, bob, alice, 1, createMode);
+      {
+        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
+        expect(totalPieces.isSome).to.be.true;
+        expect(totalPieces.unwrap().toBigInt()).to.be.eq(10n);
+      }
+    });
+  });
+
+  it.only('Check total pieces of NFT token', async () => {
+    await usingApi(async api => {
+      const createMode = 'NFT';
+      const collectionId = await createCollectionExpectSuccess({mode: {type: createMode}});
+      const tokenId = await createItemExpectSuccess(alice, collectionId, createMode, bob.address);
+      {
+        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
+        expect(totalPieces.isSome).to.be.true;
+        expect(totalPieces.unwrap().toBigInt()).to.be.eq(1n);
+      }
+
+      await transferExpectSuccess(collectionId, tokenId, bob, alice, 1, createMode);
+      {
+        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
+        expect(totalPieces.isSome).to.be.true;
+        expect(totalPieces.unwrap().toBigInt()).to.be.eq(1n);
+      }
+    });
+  });
+
+  it.only('Check total pieces of ReFungible token', async () => {
+    await usingApi(async api => {
+      const createMode = 'ReFungible';
+      const createCollectionResult = await createCollection(api, alice, {mode: {type: createMode}});
+      const collectionId  = createCollectionResult.collectionId;
+      const amountPieces = 100n;
+      const tokenId = await createItemExpectSuccess(alice, collectionId, createMode, bob.address);
+      {
+        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
+        expect(totalPieces.isSome).to.be.true;
+        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
+      }
+
+      await transferExpectSuccess(collectionId, tokenId, bob, alice, 60n, createMode);
+      {
+        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
+        expect(totalPieces.isSome).to.be.true;
+        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
+      }
+    });
+  });
 });
 
 describe('Negative integration test: ext. createItem():', () => {
modifiedtests/src/refungible.test.tsdiffbeforeafterboth
--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -68,27 +68,6 @@
     });
   });
 
-  it.only('Check total pieces of token', async () => {
-    await usingApi(async api => {
-      const createCollectionResult = await createCollection(api, alice, {mode: {type: 'ReFungible'}});
-      expect(createCollectionResult.success).to.be.true;    
-      const collectionId  = createCollectionResult.collectionId;
-      const amountPieces = 100n;
-      const result = await createRefungibleToken(api, alice, collectionId, amountPieces);
-      expect(result.success).to.be.true;
-      {
-        const totalPieces = await api.rpc.unique.totalPieces(collectionId, result.itemId);
-        expect(totalPieces.toBigInt()).to.be.eq(amountPieces);
-      }
-
-      await transfer(api, collectionId, result.itemId, alice, bob, 60n);
-      {
-        const totalPieces = await api.rpc.unique.totalPieces(collectionId, result.itemId);
-        expect(totalPieces.toBigInt()).to.be.eq(amountPieces);
-      }
-    });
-  });
-
   it('Transfer token pieces', async () => {
     await usingApi(async api => {
       const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;