difftreelog
Resolved merge conflicts.
in: master
3 files changed
pallets/nft/src/benchmarking.rsdiffbeforeafterboth1#[cfg(feature = "runtime-benchmarks")]2// mod benchmarking {3 use super::*;4 use sp_std::prelude::*;5 use frame_system::RawOrigin;6 // use frame_support::{ensure, traits::OnFinalize};7 use frame_benchmarking::{benchmarks, account, whitelisted_caller}; // , TrackedStorageKey, 8 use crate::Module as Nft;910 const SEED: u32 = 1;1112 fn default_nft_data() -> CreateItemData {13 CreateItemData::NFT(CreateNftData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] })14 }15 16 fn default_fungible_data () -> CreateItemData {17 CreateItemData::Fungible(CreateFungibleData { })18 }19 20 fn default_re_fungible_data () -> CreateItemData {21 CreateItemData::ReFungible(CreateReFungibleData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] })22 }232425 benchmarks! {2627 _ {}2829 create_collection {30 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();31 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();32 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();33 let mode: CollectionMode = CollectionMode::NFT;34 let caller: T::AccountId = account("caller", 0, SEED);35 }: create_collection(RawOrigin::Signed(caller.clone()), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode)36 verify {37 assert_eq!(Nft::<T>::collection(2).owner, caller);38 }3940 destroy_collection {41 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();42 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();43 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();44 let mode: CollectionMode = CollectionMode::NFT;45 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());46 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;47 }: destroy_collection(RawOrigin::Signed(caller.clone()), 2)4849 add_to_white_list {50 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();51 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();52 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();53 let mode: CollectionMode = CollectionMode::NFT;54 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());55 let whitelist_account: T::AccountId = account("admin", 0, SEED);56 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;57 }: add_to_white_list(RawOrigin::Signed(caller.clone()), 2, whitelist_account)5859 remove_from_white_list {60 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();61 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();62 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();63 let mode: CollectionMode = CollectionMode::NFT;64 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());65 let whitelist_account: T::AccountId = account("admin", 0, SEED);66 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;67 Nft::<T>::add_to_white_list(RawOrigin::Signed(caller.clone()).into(), 2, whitelist_account.clone())?;68 }: remove_from_white_list(RawOrigin::Signed(caller.clone()), 2, whitelist_account)6970 set_public_access_mode {71 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();72 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();73 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();74 let mode: CollectionMode = CollectionMode::NFT;75 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());76 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;77 }: set_public_access_mode(RawOrigin::Signed(caller.clone()), 2, AccessMode::WhiteList)7879 set_mint_permission {80 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();81 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();82 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();83 let mode: CollectionMode = CollectionMode::NFT;84 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());85 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;86 }: set_mint_permission(RawOrigin::Signed(caller.clone()), 2, true)8788 change_collection_owner {89 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();90 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();91 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();92 let mode: CollectionMode = CollectionMode::NFT;93 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());94 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;95 let new_owner: T::AccountId = account("admin", 0, SEED);96 }: change_collection_owner(RawOrigin::Signed(caller.clone()), 2, new_owner)9798 add_collection_admin {99 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();100 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();101 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();102 let mode: CollectionMode = CollectionMode::NFT;103 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());104 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;105 let new_admin: T::AccountId = account("admin", 0, SEED);106 }: add_collection_admin(RawOrigin::Signed(caller.clone()), 2, new_admin)107108 remove_collection_admin {109 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();110 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();111 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();112 let mode: CollectionMode = CollectionMode::NFT;113 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());114 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;115 let new_admin: T::AccountId = account("admin", 0, SEED);116 Nft::<T>::add_collection_admin(RawOrigin::Signed(caller.clone()).into(), 2, new_admin.clone())?;117 }: remove_collection_admin(RawOrigin::Signed(caller.clone()), 2, new_admin)118119 set_collection_sponsor {120 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();121 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();122 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();123 let mode: CollectionMode = CollectionMode::NFT;124 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());125 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;126 }: set_collection_sponsor(RawOrigin::Signed(caller.clone()), 2, caller.clone())127128 confirm_sponsorship {129 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();130 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();131 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();132 let mode: CollectionMode = CollectionMode::NFT;133 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());134 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;135 Nft::<T>::set_collection_sponsor(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone())?;136 }: confirm_sponsorship(RawOrigin::Signed(caller.clone()), 2)137138 remove_collection_sponsor {139 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();140 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();141 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();142 let mode: CollectionMode = CollectionMode::NFT;143 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());144 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;145 Nft::<T>::set_collection_sponsor(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone())?;146 Nft::<T>::confirm_sponsorship(RawOrigin::Signed(caller.clone()).into(), 2)?;147 }: remove_collection_sponsor(RawOrigin::Signed(caller.clone()), 2)148149 // nft item150 create_item_nft {151 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();152 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();153 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();154 let mode: CollectionMode = CollectionMode::NFT;155 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());156 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;157 let data = default_nft_data();158 159 }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)160161 #[extra]162 create_item_nft_large {163 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();164 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();165 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();166 let mode: CollectionMode = CollectionMode::NFT;167 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());168 let nft_data = CreateNftData {169 const_data: vec![],170 variable_data: vec![]171 };172 for i in 0..1998 {173 nft_data.const_data.push(10);174 nft_data.variable_data.push(10);175 }176 let mut data = CreateItemData::NFT(nft_data);177 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;178179 }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)180181 // fungible item182 create_item_fungible {183 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();184 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();185 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();186 let mode: CollectionMode = CollectionMode::Fungible(3);187 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());188 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;189 let data = default_fungible_data();190191 }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)192193 // refungible item194 create_item_refungible {195 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();196 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();197 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();198 let mode: CollectionMode = CollectionMode::ReFungible(3);199 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());200 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;201 let data = default_re_fungible_data();202203 }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)204205 burn_item {206 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();207 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();208 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();209 let mode: CollectionMode = CollectionMode::NFT;210 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());211 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;212 let data = default_nft_data();213 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;214215 }: burn_item(RawOrigin::Signed(caller.clone()), 2, 1)216217 transfer_nft {218 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();219 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();220 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();221 let mode: CollectionMode = CollectionMode::NFT;222 let recipient: T::AccountId = account("recipient", 0, SEED);223 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());224 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;225 let data = default_nft_data();226 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;227228 }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)229 230 transfer_fungible {231 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();232 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();233 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();234 let mode: CollectionMode = CollectionMode::Fungible(3);235 let recipient: T::AccountId = account("recipient", 0, SEED);236 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());237 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;238 let data = default_fungible_data();239 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;240241 }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)242243 transfer_refungible {244 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();245 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();246 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();247 let mode: CollectionMode = CollectionMode::ReFungible(3);248 let recipient: T::AccountId = account("recipient", 0, SEED);249 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());250 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;251 let data = default_re_fungible_data();252 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;253254 }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)255256 approve {257 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();258 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();259 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();260 let mode: CollectionMode = CollectionMode::ReFungible(3);261 let recipient: T::AccountId = account("recipient", 0, SEED);262 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());263 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;264 let data = default_re_fungible_data();265 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;266267 }: approve(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1)268269 // Nft270 transfer_from_nft {271 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();272 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();273 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();274 let mode: CollectionMode = CollectionMode::NFT;275 let recipient: T::AccountId = account("recipient", 0, SEED);276 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());277 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;278 let data = default_nft_data();279 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;280 Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;281282 }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)283284 // Fungible285 transfer_from_fungible {286 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();287 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();288 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();289 let mode: CollectionMode = CollectionMode::Fungible(3);290 let recipient: T::AccountId = account("recipient", 0, SEED);291 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());292 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;293 let data = default_fungible_data();294 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;295 Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;296297 }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)298299 // ReFungible300 transfer_from_refungible {301 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();302 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();303 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();304 let mode: CollectionMode = CollectionMode::ReFungible(3);305 let recipient: T::AccountId = account("recipient", 0, SEED);306 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());307 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;308 let data = default_re_fungible_data();309 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;310 Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;311312 }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)313314 set_offchain_schema {315 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();316 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();317 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();318 let mode: CollectionMode = CollectionMode::ReFungible(3);319 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());320 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;321322 }: set_offchain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())323324 set_const_on_chain_schema {325 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();326 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();327 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();328 let mode: CollectionMode = CollectionMode::ReFungible(3);329 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());330 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;331 }: set_const_on_chain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())332 333 set_variable_on_chain_schema {334 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();335 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();336 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();337 let mode: CollectionMode = CollectionMode::ReFungible(3);338 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());339 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;340 }: set_variable_on_chain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())341342 set_variable_meta_data {343 let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();344 let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();345 let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();346 let mode: CollectionMode = CollectionMode::NFT;347 let caller: T::AccountId = T::AccountId::from(whitelisted_caller());348 Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;349 let data = default_nft_data();350 Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;351352 }: set_variable_meta_data(RawOrigin::Signed(caller.clone()), 2, 1, [1, 2, 3].to_vec())353}pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -837,8 +837,8 @@
let target_collection = <Collection<T>>::get(collection_id);
Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;
- Self::validate_create_item_args(&target_collection, &properties)?;
- Self::create_item_no_validation(collection_id, &target_collection, &properties, &owner)?;
+ Self::validate_create_item_args(&target_collection, &data)?;
+ Self::create_item_no_validation(collection_id, &target_collection, owner, data)?;
Ok(())
}
@@ -858,13 +858,15 @@
///
/// * collection_id: ID of the collection.
///
- /// * properties: Array items properties. Each property is an array of bytes itself, see [create_item].
+ /// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item].
///
/// * owner: Address, initial owner of the NFT.
- #[weight = 0]
- pub fn create_multiple_items(origin, collection_id: u64, properties: Vec<Vec<u8>>, owner: T::AccountId) -> DispatchResult {
+ #[weight = T::WeightInfo::create_item(items_data.into_iter()
+ .map(|data| { data.len() })
+ .sum())]
+ pub fn create_multiple_items(origin, collection_id: u64, owner: T::AccountId, items_data: Vec<CreateItemData>) -> DispatchResult {
- ensure!(properties.len() > 0, "Length of items properties must be greater than 0.");
+ ensure!(items_data.len() > 0, "Length of items properties must be greater than 0.");
let sender = ensure_signed(origin)?;
Self::collection_exists(collection_id)?;
@@ -872,11 +874,11 @@
Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;
- for prop in &properties {
- Self::validate_create_item_args(&target_collection, prop)?;
+ for data in &items_data {
+ Self::validate_create_item_args(&target_collection, data)?;
}
- for prop in &properties {
- Self::create_item_no_validation(collection_id, &target_collection, prop, &owner)?;
+ for data in &items_data {
+ Self::create_item_no_validation(collection_id, &target_collection, owner.clone(), data.clone())?;
}
Ok(())
@@ -1289,61 +1291,64 @@
Ok(())
}
-
- fn validate_create_item_args(collection: &CollectionType<T::AccountId>, properties: &Vec<u8>) -> DispatchResult {
- match collection.mode
+ fn validate_create_item_args(target_collection: &CollectionType<T::AccountId>, data: &CreateItemData) -> DispatchResult {
+ match target_collection.mode
{
- CollectionMode::NFT(_) => {
-
- // check size
- ensure!(collection.custom_data_size >= properties.len() as u32, "Size of item is too large")
+ CollectionMode::NFT => {
+ if let CreateItemData::NFT(data) = data {
+ // check sizes
+ ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, "const_data exceeded data limit.");
+ ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, "variable_data exceeded data limit.");
+ } else {
+ fail!("Not NFT item data used to mint in NFT collection.");
+ }
},
CollectionMode::Fungible(_) => {
-
- // check size
- ensure!(properties.len() as u32 == 0, "Size of item must be 0 with fungible type")
+ if let CreateItemData::Fungible(_) = data {
+ } else {
+ fail!("Not Fungible item data used to mint in Fungible collection.");
+ }
},
- CollectionMode::ReFungible(_, _) => {
+ CollectionMode::ReFungible(_) => {
+ if let CreateItemData::ReFungible(data) = data {
- // check size
- ensure!(collection.custom_data_size >= properties.len() as u32, "Size of item is too large")
+ // check sizes
+ ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, "const_data exceeded data limit.");
+ ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, "variable_data exceeded data limit.");
+ } else {
+ fail!("Not Re Fungible item data used to mint in Re Fungible collection.");
+ }
},
- _ => {
- fail!("Unexpected collection mode")
- }
- }
+ _ => { fail!("Unexpected collection type."); }
+ };
Ok(())
}
- fn create_item_no_validation(collection_id: u64, collection: &CollectionType<T::AccountId>, properties: &Vec<u8>, owner: &T::AccountId) -> DispatchResult {
- match collection.mode
+ fn create_item_no_validation(collection_id: u64, collection: &CollectionType<T::AccountId>, owner: T::AccountId, data: CreateItemData) -> DispatchResult {
+ match data
{
- CollectionMode::NFT(_) => {
-
- // Create nft item
+ CreateItemData::NFT(data) => {
let item = NftItemType {
collection: collection_id,
- owner: owner.clone(),
- data: properties.clone(),
+ owner,
+ const_data: data.const_data,
+ variable_data: data.variable_data
};
Self::add_nft_item(item)?;
-
},
- CollectionMode::Fungible(_) => {
-
+ CreateItemData::Fungible(_) => {
let item = FungibleItemType {
collection: collection_id,
- owner: owner.clone(),
+ owner,
value: (10 as u128).pow(collection.decimal_points)
};
Self::add_fungible_item(item)?;
},
- CollectionMode::ReFungible(_, _) => {
-
+ CreateItemData::ReFungible(data) => {
let mut owner_list = Vec::new();
let value = (10 as u128).pow(collection.decimal_points);
owner_list.push(Ownership {owner: owner.clone(), fraction: value});
@@ -1351,15 +1356,15 @@
let item = ReFungibleItemType {
collection: collection_id,
owner: owner_list,
- data: properties.clone()
+ const_data: data.const_data,
+ variable_data: data.variable_data
};
Self::add_refungible_item(item)?;
- },
- _ => { ensure!(1 == 0,"just error"); }
-
+ }
};
+
// call event
Self::deposit_event(RawEvent::ItemCreated(collection_id, <ItemListIndex>::get(collection_id)));
pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -92,41 +92,23 @@
#[test]
fn create_nft_multiple_items() {
new_test_ext().execute_with(|| {
- let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
- let mode: CollectionMode = CollectionMode::NFT(2000);
-
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- }));
+ default_limits();
+
+ create_test_collection(&CollectionMode::NFT, 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_collection(
- origin1.clone(),
- col_name1.clone(),
- col_desc1.clone(),
- token_prefix1.clone(),
- mode
- ));
- assert_eq!(TemplateModule::collection(1).owner, 1);
- let properties = [[1, 2, 3].to_vec(), [3, 2, 1].to_vec(), [3, 3, 3].to_vec()].to_vec();
+ let items_data = vec![default_nft_data(), default_nft_data(), default_nft_data()];
assert_ok!(TemplateModule::create_multiple_items(
origin1.clone(),
1,
- properties.clone(),
- 1
+ 1,
+ items_data.clone().into_iter().map(|d| { d.into() }).collect()
));
- for (index, data) in properties.iter().enumerate() {
- assert_eq!(TemplateModule::nft_item_id(1, (index + 1) as u64).data, *data);
+ for (index, data) in items_data.iter().enumerate() {
+ assert_eq!(TemplateModule::nft_item_id(1, (index + 1) as u64).const_data.to_vec(), data.const_data);
+ assert_eq!(TemplateModule::nft_item_id(1, (index + 1) as u64).variable_data.to_vec(), data.variable_data);
}
});
}
@@ -160,43 +142,25 @@
#[test]
fn create_multiple_refungible_items() {
new_test_ext().execute_with(|| {
- let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(2000, 3);
-
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- }));
+ default_limits();
+
+ create_test_collection(&CollectionMode::ReFungible(3), 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_collection(
- origin1.clone(),
- col_name1.clone(),
- col_desc1.clone(),
- token_prefix1.clone(),
- mode
- ));
- assert_eq!(TemplateModule::collection(1).owner, 1);
- let properties = [[1, 2, 3].to_vec(), [3, 2, 1].to_vec(), [3, 3, 3].to_vec()].to_vec();
+ let items_data = vec![default_re_fungible_data(), default_re_fungible_data(), default_re_fungible_data()];
assert_ok!(TemplateModule::create_multiple_items(
origin1.clone(),
1,
- properties.clone(),
- 1
+ 1,
+ items_data.clone().into_iter().map(|d| { d.into() }).collect()
));
- for (index, data) in properties.iter().enumerate() {
+ for (index, data) in items_data.iter().enumerate() {
let item = TemplateModule::refungible_item_id(1, (index + 1) as u64);
- assert_eq!(item.data, *data);
+ assert_eq!(item.const_data.to_vec(), data.const_data);
+ assert_eq!(item.variable_data.to_vec(), data.variable_data);
assert_eq!(
item.owner[0],
Ownership {
@@ -225,41 +189,22 @@
#[test]
fn create_multiple_fungible_items() {
new_test_ext().execute_with(|| {
- let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
- let mode: CollectionMode = CollectionMode::Fungible(3);
+ default_limits();
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- }));
+ create_test_collection(&CollectionMode::Fungible(3), 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_collection(
- origin1.clone(),
- col_name1.clone(),
- col_desc1.clone(),
- token_prefix1.clone(),
- mode
- ));
- assert_eq!(TemplateModule::collection(1).owner, 1);
- let properties = [[].to_vec(), [].to_vec(), [].to_vec()].to_vec();
+ let items_data = vec![default_fungible_data(), default_fungible_data(), default_fungible_data()];
assert_ok!(TemplateModule::create_multiple_items(
origin1.clone(),
1,
- properties.clone(),
- 1
+ 1,
+ items_data.clone().into_iter().map(|d| { d.into() }).collect()
));
- for (index, _) in properties.iter().enumerate() {
+ for (index, _) in items_data.iter().enumerate() {
assert_eq!(TemplateModule::fungible_item_id(1, (index + 1) as u64).owner, 1);
}
assert_eq!(TemplateModule::balance_count(1, 1), 3000);
@@ -1471,7 +1416,7 @@
assert_noop!(
TemplateModule::create_item(origin2.clone(), 1, 2, default_nft_data().into()),
- "Public minting is not allowed for this collection."
+ "Public minting is not allowed for this collection"
);
});
}
@@ -1500,7 +1445,7 @@
assert_noop!(
TemplateModule::create_item(origin2.clone(), 1, 2, default_nft_data().into()),
- "Public minting is not allowed for this collection."
+ "Public minting is not allowed for this collection"
);
});
}