difftreelog
NFT-56 + 47 added
in: master
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth24pub struct CollectionType<AccountId> {24pub struct CollectionType<AccountId> {25 pub owner: AccountId,25 pub owner: AccountId,26 pub next_item_id: u64,26 pub next_item_id: u64,27 pub name: Vec<u16>, // 64 include null escape char28 pub description: Vec<u16>, // 256 include null escape char29 pub token_prefix: Vec<u8>, // 16 include null escape char27 pub custom_data_size: u32,30 pub custom_data_size: u32,28}31}293259 /// Next available collection ID62 /// Next available collection ID60 pub NextCollectionID get(fn next_collection_id): u64;63 pub NextCollectionID get(fn next_collection_id): u64;6162 pub Collection get(collection): map hasher(identity) u64 => CollectionType<T::AccountId>;64 pub Collection get(fn collection): map hasher(identity) u64 => CollectionType<T::AccountId>;63 //pub Collection get(collection): map hasher(identity) u64 => CollectionType<T::AccountId>;6465 pub AdminList get(admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;65 pub AdminList get(fn admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;666667 /// Balance owner per collection map67 /// Balance owner per collection map68 pub Balance get(balance_count): map hasher(blake2_128_concat) (u64, T::AccountId) => u64;68 pub Balance get(fn balance_count): map hasher(blake2_128_concat) (u64, T::AccountId) => u64;69 pub ApprovedList get(approved): map hasher(blake2_128_concat) (u64, u64) => Vec<T::AccountId>;69 pub ApprovedList get(fn approved): map hasher(blake2_128_concat) (u64, u64) => Vec<T::AccountId>;707071 pub ItemList get(item_id): map hasher(blake2_128_concat) (u64, u64) => NftItemType<T::AccountId>;71 pub ItemList get(fn item_id): map hasher(blake2_128_concat) (u64, u64) => NftItemType<T::AccountId>;72 // pub ItemList get(item_id): map hasher(blake2_128_concat) (u64, u64) => NftItemType<T::AccountId>;7374 pub ItemListIndex get(item_index): map hasher(blake2_128_concat) u64 => u64;72 pub ItemListIndex get(fn item_index): map hasher(blake2_128_concat) u64 => u64;75 // pub ItemListIndex get(item_index): map hasher(blake2_128_concat) u64 => u64;7374 pub AddressTokens get(fn address_tokens): map hasher(blake2_128_concat) (u64, T::AccountId) => Vec<u64>;76 }75 }77}76}787782 where81 where83 AccountId = <T as system::Trait>::AccountId,82 AccountId = <T as system::Trait>::AccountId,84 {83 {85 Created(u32, AccountId),84 Created(u64, AccountId),85 ItemCreated(u64),86 ItemDestroyed(u64, u64),86 }87 }87);88);8889110 // returns collection ID111 // returns collection ID111 #[weight = frame_support::weights::SimpleDispatchInfo::default()]112 #[weight = frame_support::weights::SimpleDispatchInfo::default()]112 pub fn create_collection(origin, custom_data_sz: u32) -> DispatchResult {113 pub fn create_collection( origin, 114 collection_name: Vec<u16>, 115 collection_description: Vec<u16>, 116 token_prefix: Vec<u8>, 117 custom_data_sz: u32) -> DispatchResult {118113 // Anyone can create a collection119 // Anyone can create a collection114 let who = ensure_signed(origin)?;120 let who = ensure_signed(origin)?;121122 // check params 123 let mut name = collection_name.to_vec();124 name.push(0);125 ensure!(name.len() <= 64, "Collection name can not be longer than 63 char");126127 let mut description = collection_description.to_vec();128 description.push(0);129 ensure!(name.len() <= 256, "Collection description can not be longer than 255 char");130131 let mut prefix = token_prefix.to_vec();132 prefix.push(0);133 ensure!(prefix.len() <= 16, "Token prefix can not be longer than 15 char");115134116 // Generate next collection ID135 // Generate next collection ID117 let next_id = NextCollectionID::get();136 let next_id = NextCollectionID::get()137 .checked_add(1)138 .expect("collection id error");118139119 NextCollectionID::put(next_id);140 NextCollectionID::put(next_id);120141121 // Create new collection142 // Create new collection122 let new_collection = CollectionType {143 let new_collection = CollectionType {123 owner: who,144 owner: who.clone(),145 name: name,146 description: description,147 token_prefix: prefix,124 next_item_id: next_id,148 next_item_id: next_id,125 custom_data_size: custom_data_sz,149 custom_data_size: custom_data_sz,126 };150 };127151128 // Add new collection to map152 // Add new collection to map129 <Collection<T>>::insert(next_id, new_collection);153 <Collection<T>>::insert(next_id, new_collection);154155 // call event156 Self::deposit_event(RawEvent::Created(next_id, who.clone()));130157131 Ok(())158 Ok(())132 }159 }276249277250 let current_index = <ItemListIndex>::get(collection_id);278 let current_index = <ItemListIndex>::get(collection_id)279 .checked_add(1)280 .expect("Item list index id error");281282 Self::add_token_index(collection_id, current_index, new_item.owner.clone())?;283251 <ItemListIndex>::insert(collection_id, current_index);284 <ItemListIndex>::insert(collection_id, current_index);252 <ItemList<T>>::insert((collection_id, current_index), new_item);285 <ItemList<T>>::insert((collection_id, current_index), new_item);286287 // call event288 Self::deposit_event(RawEvent::ItemCreated(collection_id));253289254 Ok(())290 Ok(())255 }291 }279 }315 }280 <ItemList<T>>::remove((collection_id, item_id));316 <ItemList<T>>::remove((collection_id, item_id));317318 Self::remove_token_index(collection_id, item_id, item.owner.clone())?;281319282 // update balance320 // update balance283 let new_balance = <Balance<T>>::get((collection_id, item.owner.clone())) - 1;321 let new_balance = <Balance<T>>::get((collection_id, item.owner.clone())) - 1;284 <Balance<T>>::insert((collection_id, item.owner.clone()), new_balance);322 <Balance<T>>::insert((collection_id, item.owner.clone()), new_balance);323324 // call event325 Self::deposit_event(RawEvent::ItemDestroyed(collection_id, item_id));285326286 Ok(())327 Ok(())287 }328 }319 <Balance<T>>::insert((collection_id, new_owner.clone()), balance_new_owner);360 <Balance<T>>::insert((collection_id, new_owner.clone()), balance_new_owner);320361321 // change owner362 // change owner322 item.owner = new_owner;363 let old_owner = item.owner.clone();364 item.owner = new_owner.clone();323 <ItemList<T>>::insert((collection_id, item_id), item);365 <ItemList<T>>::insert((collection_id, item_id), item);366367 // update index collection368 Self::move_token_index(collection_id, item_id, old_owner, new_owner.clone())?;324369325 // reset approved list370 // reset approved list326 let itm: Vec<T::AccountId> = Vec::new();371 let itm: Vec<T::AccountId> = Vec::new();403}448}404449450451impl<T: Trait> Module<T> {452 fn add_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {453 454 let list_exists = <AddressTokens<T>>::contains_key((collection_id, owner.clone()));455 if list_exists {456457 let mut list = <AddressTokens<T>>::get((collection_id, owner.clone()));458 let item_contains = list.contains(&item_index.clone());459460 if !item_contains {461 list.push(item_index.clone());462 }463464 <AddressTokens<T>>::insert((collection_id, owner.clone()), list);465466 } else {467468 let mut itm = Vec::new();469 itm.push(item_index.clone());470 <AddressTokens<T>>::insert((collection_id, owner), itm);471 }472473 Ok(())474 }475476 fn remove_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {477 478 let list_exists = <AddressTokens<T>>::contains_key((collection_id, owner.clone()));479 if list_exists {480481 let mut list = <AddressTokens<T>>::get((collection_id, owner.clone()));482 let item_contains = list.contains(&item_index.clone());483484 if item_contains {485 list.retain(|&item| item != item_index);486 <AddressTokens<T>>::insert((collection_id, owner), list);487 }488 }489490 Ok(())491 }492493 fn move_token_index(collection_id: u64, item_index: u64, old_owner: T::AccountId, new_owner: T::AccountId) -> DispatchResult {494 495 Self::remove_token_index(collection_id, item_index, old_owner)?;496 Self::add_token_index(collection_id, item_index, new_owner)?;497 498 Ok(())499 }500}pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -5,9 +5,14 @@
#[test]
fn create_collection_test() {
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 size = 1024;
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
});
}
@@ -15,10 +20,15 @@
#[test]
fn change_collection_owner() {
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 size = 1024;
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_ok!(TemplateModule::change_collection_owner(
origin1.clone(),
1,
@@ -31,10 +41,15 @@
#[test]
fn destroy_collection() {
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 size = 1024;
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_ok!(TemplateModule::destroy_collection(origin1.clone(), 1));
});
}
@@ -42,11 +57,16 @@
#[test]
fn create_item() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
assert_ok!(TemplateModule::create_item(
origin2.clone(),
@@ -62,11 +82,16 @@
#[test]
fn burn_item() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
assert_ok!(TemplateModule::create_item(
origin2.clone(),
@@ -91,14 +116,19 @@
#[test]
fn add_collection_admin() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -116,14 +146,19 @@
#[test]
fn remove_collection_admin() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -149,14 +184,19 @@
#[test]
fn balance_of() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -181,14 +221,19 @@
#[test]
fn transfer() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -214,14 +259,19 @@
#[test]
fn approve() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -243,14 +293,19 @@
#[test]
fn get_approved() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -272,14 +327,19 @@
#[test]
fn transfer_from() {
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 size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
let origin3 = Origin::signed(3);
- assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin2.clone(), size));
- assert_ok!(TemplateModule::create_collection(origin3.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
assert_eq!(TemplateModule::collection(1).owner, 1);
assert_eq!(TemplateModule::collection(2).owner, 2);
@@ -297,3 +357,50 @@
assert_ok!(TemplateModule::transfer_from(origin1.clone(), 1, 1, 2));
});
}
+
+#[test]
+fn index_list() {
+ 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 size = 1024;
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
+ let origin3 = Origin::signed(3);
+
+ assert_ok!(TemplateModule::create_collection(origin1.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin2.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+ assert_ok!(TemplateModule::create_collection(origin3.clone(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), size));
+
+ assert_eq!(TemplateModule::collection(1).owner, 1);
+ assert_eq!(TemplateModule::collection(2).owner, 2);
+ assert_eq!(TemplateModule::collection(3).owner, 3);
+ // create items
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 2].to_vec()
+ ));
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 2, 3].to_vec()
+ ));
+ assert_eq!(TemplateModule::address_tokens((1, 1)).len(), 3);
+ // burn one
+ assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 2));
+ assert_eq!(TemplateModule::address_tokens((1, 1)).len(), 2);
+ // burn another one
+ assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 3));
+ assert_eq!(TemplateModule::address_tokens((1, 1))[0], 1);
+ });
+}
+