difftreelog
Bad merge fixed
in: master
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth43 OFFCHAIN_SCHEMA_LIMIT, MAX_TOKEN_PREFIX_LENGTH, MAX_COLLECTION_NAME_LENGTH,43 OFFCHAIN_SCHEMA_LIMIT, MAX_TOKEN_PREFIX_LENGTH, MAX_COLLECTION_NAME_LENGTH,44 MAX_COLLECTION_DESCRIPTION_LENGTH, AccessMode, Collection, CreateItemData, CollectionLimits,44 MAX_COLLECTION_DESCRIPTION_LENGTH, AccessMode, Collection, CreateItemData, CollectionLimits,45 CollectionId, CollectionMode, TokenId, SchemaVersion, SponsorshipState, Ownership, NftItemType,45 CollectionId, CollectionMode, TokenId, SchemaVersion, SponsorshipState, Ownership, NftItemType,46 FungibleItemType, ReFungibleItemType,46 MetaUpdatePermission, FungibleItemType, ReFungibleItemType,47};47};484849#[cfg(test)]49#[cfg(test)]971 Self::check_owner_permissions(&target_collection, &sender)?;971 Self::check_owner_permissions(&target_collection, &sender)?;972972973 target_collection.meta_update_permission = value;973 target_collection.meta_update_permission = value;974 Self::save_collection(target_collection);974 <CollectionById<T>>::insert(target_collection.id, target_collection.collection);975975976 Ok(())976 Ok(())977 }977 }1546 item_id: TokenId,1546 item_id: TokenId,1547 ) -> DispatchResult {1547 ) -> DispatchResult {1548 match collection.meta_update_permission {1548 match collection.meta_update_permission {1549 MetaUpdatePermission::ItemOwner => {1549 MetaUpdatePermission::ItemOwner => ensure!(1550 ensure!(1551 Self::is_item_owner(sender, collection, item_id),1550 Self::is_item_owner(sender, collection, item_id)?,1552 Error::<T>::NoPermission1551 Error::<T>::NoPermission1553 );1552 ),1554 }1555 MetaUpdatePermission::Admin => {1553 MetaUpdatePermission::Admin => ensure!(1556 ensure!(1557 Self::is_owner_or_admin_permissions(collection, sender),1554 Self::is_owner_or_admin_permissions(collection, sender)?,1558 Error::<T>::NoPermission1555 Error::<T>::NoPermission1559 );1556 ),1560 }1561 MetaUpdatePermission::None => {1557 MetaUpdatePermission::None => fail!(Error::<T>::MetadataUpdateDenied),1562 fail!(Error::<T>::MetadataUpdateDenied);1563 }1564 }1558 }156515591566 Ok(())1560 Ok(())pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -2007,7 +2007,7 @@
#[test]
fn set_variable_meta_data_on_nft_with_item_owner_permission_flag() {
new_test_ext().execute_with(|| {
- default_limits();
+ //default_limits();
let collection_id = create_test_collection(&CollectionMode::NFT, 1);
@@ -2022,7 +2022,7 @@
MetaUpdatePermission::ItemOwner,
);
- let variable_data = b"test set_variable_meta_data method.".to_vec();
+ let variable_data = b"ten chars.".to_vec();
assert_ok!(TemplateModule::set_variable_meta_data(
origin1,
collection_id,
@@ -2042,7 +2042,7 @@
#[test]
fn set_variable_meta_data_on_nft_with_item_owner_permission_flag_neg() {
new_test_ext().execute_with(|| {
- default_limits();
+ // default_limits();
let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
@@ -2063,13 +2063,13 @@
let data = default_nft_data();
create_test_item(1, &data.into());
- TemplateModule::set_meta_update_permission_flag(
+ assert_ok!(TemplateModule::set_meta_update_permission_flag(
origin2.clone(),
collection_id,
MetaUpdatePermission::ItemOwner,
- );
+ ));
- let variable_data = b"test set_variable_meta_data method.".to_vec();
+ let variable_data = b"ten chars.++".to_vec();
assert_noop!(
TemplateModule::set_variable_meta_data(
origin2,
@@ -2077,7 +2077,7 @@
1,
variable_data.clone()
),
- Error::<Test>::NoPermission
+ Error::<Test>::TokenVariableDataLimitExceeded
);
#[test]
@@ -2108,7 +2108,7 @@
#[test]
fn set_variable_meta_data_on_nft_with_admin_flag() {
new_test_ext().execute_with(|| {
- default_limits();
+ // default_limits();
let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
@@ -2135,11 +2135,11 @@
let data = default_nft_data();
create_test_item(1, &data.into());
- TemplateModule::set_meta_update_permission_flag(
+ assert_ok!(TemplateModule::set_meta_update_permission_flag(
origin2.clone(),
collection_id,
MetaUpdatePermission::Admin,
- );
+ ));
let variable_data = b"test set_variable_meta_data method.".to_vec();
assert_ok!(TemplateModule::set_variable_meta_data(
@@ -2161,7 +2161,7 @@
#[test]
fn set_variable_meta_data_on_nft_with_admin_flag_neg() {
new_test_ext().execute_with(|| {
- default_limits();
+ // default_limits();
let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
@@ -2182,11 +2182,11 @@
let data = default_nft_data();
create_test_item(1, &data.into());
- TemplateModule::set_meta_update_permission_flag(
+ assert_ok!(TemplateModule::set_meta_update_permission_flag(
origin2.clone(),
collection_id,
MetaUpdatePermission::Admin,
- );
+ ));
let variable_data = b"test set_variable_meta_data method.".to_vec();
assert_noop!(
@@ -2204,17 +2204,17 @@
#[test]
fn set_variable_meta_flag_after_freeze() {
new_test_ext().execute_with(|| {
- default_limits();
+ // default_limits();
let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
let origin2 = Origin::signed(2);
- TemplateModule::set_meta_update_permission_flag(
+ assert_ok!(TemplateModule::set_meta_update_permission_flag(
origin2.clone(),
collection_id,
MetaUpdatePermission::None,
- );
+ ));
assert_noop!(
TemplateModule::set_meta_update_permission_flag(
origin2.clone(),
@@ -2229,7 +2229,7 @@
#[test]
fn set_variable_meta_data_on_nft_with_none_flag_neg() {
new_test_ext().execute_with(|| {
- default_limits();
+ // default_limits();
let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
let origin1 = Origin::signed(1);
@@ -2237,11 +2237,11 @@
let data = default_nft_data();
create_test_item(1, &data.into());
- TemplateModule::set_meta_update_permission_flag(
+ assert_ok!(TemplateModule::set_meta_update_permission_flag(
origin1.clone(),
collection_id,
MetaUpdatePermission::None,
- );
+ ));
let variable_data = b"test set_variable_meta_data method.".to_vec();
assert_noop!(