`55d2f5bff434`

6 files changed

modifiedpallets/nft/src/mock.rsdiff before after both

98	type WeightInfo = ();98	type WeightInfo = ();
99}99}
100100
101<<<<<<< HEAD
102type Timestamp = pallet_timestamp::Pallet<Test>;
103type Randomness = pallet_randomness_collective_flip::Pallet<Test>;
104
105=======
106>>>>>>> origin/develop
107parameter_types! {101parameter_types! {
108	pub const CollectionCreationPrice: u32 = 0;102	pub const CollectionCreationPrice: u32 = 0;
109	pub TreasuryAccountId: u64 = 1234;103	pub TreasuryAccountId: u64 = 1234;

modifiedpallets/nft/src/tests.rsdiff before after both

2080			Error::<Test>::NoPermission2080			Error::<Test>::NoPermission
2081		);2081		);
20822082
2083#[test]2083		#[test]
2084fn collection_transfer_flag_works() {2084		fn collection_transfer_flag_works() {
2085	new_test_ext().execute_with(|| {2085			new_test_ext().execute_with(|| {
2086		let origin1 = Origin::signed(1);2086				let origin1 = Origin::signed(1);
20872087
2088		let collection_id = create_test_collection(&CollectionMode::NFT, 1);2088				let collection_id = create_test_collection(&CollectionMode::NFT, 1);
2089		assert_ok!(TemplateModule::set_transfers_enabled_flag(origin1, 1, true));2089				assert_ok!(TemplateModule::set_transfers_enabled_flag(origin1, 1, true));
20902090
2091		let data = default_nft_data();2091				let data = default_nft_data();
2092		create_test_item(collection_id, &data.into());2092				create_test_item(collection_id, &data.into());
2093		assert_eq!(TemplateModule::balance_count(1, 1), 1);2093				assert_eq!(TemplateModule::balance_count(1, 1), 1);
2094		assert_eq!(TemplateModule::address_tokens(1, 1), [1]);2094				assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
20952095
2096		let origin1 = Origin::signed(1);2096				let origin1 = Origin::signed(1);
20972097
2098		// default scenario2098				// default scenario
2099		assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1000));2099				assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1000));
2100		assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));2100				assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));
2101		assert_eq!(TemplateModule::balance_count(1, 1), 0);2101				assert_eq!(TemplateModule::balance_count(1, 1), 0);
2102		assert_eq!(TemplateModule::balance_count(1, 2), 1);2102				assert_eq!(TemplateModule::balance_count(1, 2), 1);
21032103
2104		assert_eq!(TemplateModule::address_tokens(1, 2), [1]);2104				assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
2105	});2105			});
2106}2106		}
21072107
2108#[test]2108		#[test]
2109fn set_variable_meta_data_on_nft_with_admin_flag() {2109		fn set_variable_meta_data_on_nft_with_admin_flag() {
2110	new_test_ext().execute_with(|| {2110			new_test_ext().execute_with(|| {
2111		default_limits();2111				default_limits();
21122112
2113		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);2113				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
21142114
2115		let origin1 = Origin::signed(1);2115				let origin1 = Origin::signed(1);
2116		let origin2 = Origin::signed(2);2116				let origin2 = Origin::signed(2);
21172117
2118		assert_ok!(TemplateModule::set_mint_permission(2118				assert_ok!(TemplateModule::set_mint_permission(
2119			origin2.clone(),2119					origin2.clone(),
2120			collection_id,2120					collection_id,
2121			true2121					true
2122		));2122				));
2123		assert_ok!(TemplateModule::add_to_white_list(2123				assert_ok!(TemplateModule::add_to_white_list(
2124			origin2.clone(),2124					origin2.clone(),
2125			collection_id,2125					collection_id,
2126			account(1)2126					account(1)
2127		));2127				));
21282128
2129		assert_ok!(TemplateModule::add_collection_admin(2129				assert_ok!(TemplateModule::add_collection_admin(
2130			origin2.clone(),2130					origin2.clone(),
2131			collection_id,2131					collection_id,
2132			account(1)2132					account(1)
2133		));2133				));
21342134
2135		let data = default_nft_data();2135				let data = default_nft_data();
2136		create_test_item(1, &data.into());2136				create_test_item(1, &data.into());
21372137
2138		TemplateModule::set_meta_update_permission_flag(2138				TemplateModule::set_meta_update_permission_flag(
2139			origin2.clone(),2139					origin2.clone(),
2140			collection_id,2140					collection_id,
2141			MetaUpdatePermission::Admin,2141					MetaUpdatePermission::Admin,
2142		);2142				);
21432143
2144		let variable_data = b"test set_variable_meta_data method.".to_vec();2144				let variable_data = b"test set_variable_meta_data method.".to_vec();
2145		assert_ok!(TemplateModule::set_variable_meta_data(2145				assert_ok!(TemplateModule::set_variable_meta_data(
2146			origin1,2146					origin1,
2147			collection_id,2147					collection_id,
2148			1,2148					1,
2149			variable_data.clone()2149					variable_data.clone()
2150		));2150				));
21512151
2152		assert_eq!(2152				assert_eq!(
2153			TemplateModule::nft_item_id(collection_id, 1)2153					TemplateModule::nft_item_id(collection_id, 1)
2154				.unwrap()2154						.unwrap()
2155				.variable_data,2155						.variable_data,
2156			variable_data2156					variable_data
2157		);2157				);
2158	});2158			});
2159}2159		}
21602160
2161#[test]2161		#[test]
2162fn set_variable_meta_data_on_nft_with_admin_flag_neg() {2162		fn set_variable_meta_data_on_nft_with_admin_flag_neg() {
2163	new_test_ext().execute_with(|| {2163			new_test_ext().execute_with(|| {
2164		default_limits();2164				default_limits();
21652165
2166		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);2166				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
21672167
2168		let origin1 = Origin::signed(1);2168				let origin1 = Origin::signed(1);
2169		let origin2 = Origin::signed(2);2169				let origin2 = Origin::signed(2);
21702170
2171		assert_ok!(TemplateModule::set_mint_permission(2171				assert_ok!(TemplateModule::set_mint_permission(
2172			origin2.clone(),2172					origin2.clone(),
2173			collection_id,2173					collection_id,
2174			true2174					true
2175		));2175				));
2176		assert_ok!(TemplateModule::add_to_white_list(2176				assert_ok!(TemplateModule::add_to_white_list(
2177			origin2.clone(),2177					origin2.clone(),
2178			collection_id,2178					collection_id,
2179			account(1)2179					account(1)
2180		));2180				));
21812181
2182		let data = default_nft_data();2182				let data = default_nft_data();
2183		create_test_item(1, &data.into());2183				create_test_item(1, &data.into());
21842184
2185		TemplateModule::set_meta_update_permission_flag(2185				TemplateModule::set_meta_update_permission_flag(
2186			origin2.clone(),2186					origin2.clone(),
2187			collection_id,2187					collection_id,
2188			MetaUpdatePermission::Admin,2188					MetaUpdatePermission::Admin,
2189		);2189				);
21902190
2191		let variable_data = b"test set_variable_meta_data method.".to_vec();2191				let variable_data = b"test set_variable_meta_data method.".to_vec();
2192		assert_noop!(2192				assert_noop!(
2193			TemplateModule::set_variable_meta_data(2193					TemplateModule::set_variable_meta_data(
2194				origin1,2194						origin1,
2195				collection_id,2195						collection_id,
2196				1,2196						1,
2197				variable_data.clone()2197						variable_data.clone()
2198			),2198					),
2199			Error::<Test>::NoPermission2199					Error::<Test>::NoPermission
2200		);2200				);
2201	});2201			});
2202}2202		}
22032203
2204#[test]2204		#[test]
2205fn set_variable_meta_flag_after_freeze() {2205		fn set_variable_meta_flag_after_freeze() {
2206	new_test_ext().execute_with(|| {2206			new_test_ext().execute_with(|| {
2207		default_limits();2207				default_limits();
22082208
2209		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);2209				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
22102210
2211		let origin2 = Origin::signed(2);2211				let origin2 = Origin::signed(2);
22122212
2213		TemplateModule::set_meta_update_permission_flag(2213				TemplateModule::set_meta_update_permission_flag(
2214			origin2.clone(),2214					origin2.clone(),
2215			collection_id,2215					collection_id,
2216			MetaUpdatePermission::None,2216					MetaUpdatePermission::None,
2217		);2217				);
2218		assert_noop!(2218				assert_noop!(
2219			TemplateModule::set_meta_update_permission_flag(2219					TemplateModule::set_meta_update_permission_flag(
2220				origin2.clone(),2220						origin2.clone(),
2221				collection_id,2221						collection_id,
2222				MetaUpdatePermission::Admin2222						MetaUpdatePermission::Admin
2223			),2223					),
2224			Error::<Test>::MetadataFlagFrozen2224					Error::<Test>::MetadataFlagFrozen
2225		);2225				);
2226	});2226			});
2227}2227		}
22282228
2229#[test]2229		#[test]
2230fn set_variable_meta_data_on_nft_with_none_flag_neg() {2230		fn set_variable_meta_data_on_nft_with_none_flag_neg() {
2231	new_test_ext().execute_with(|| {2231			new_test_ext().execute_with(|| {
2232		default_limits();2232				default_limits();
22332233
2234		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);2234				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
2235		let origin1 = Origin::signed(1);2235				let origin1 = Origin::signed(1);
22362236
2237		let data = default_nft_data();2237				let data = default_nft_data();
2238		create_test_item(1, &data.into());2238				create_test_item(1, &data.into());
22392239
2240		TemplateModule::set_meta_update_permission_flag(2240				TemplateModule::set_meta_update_permission_flag(
2241			origin1.clone(),2241					origin1.clone(),
2242			collection_id,2242					collection_id,
2243			MetaUpdatePermission::None,2243					MetaUpdatePermission::None,
2244		);2244				);
22452245
2246		let variable_data = b"test set_variable_meta_data method.".to_vec();2246				let variable_data = b"test set_variable_meta_data method.".to_vec();
2247		assert_noop!(2247				assert_noop!(
2248			TemplateModule::set_variable_meta_data(2248					TemplateModule::set_variable_meta_data(
2249				origin1.clone(),2249						origin1.clone(),
2250				collection_id,2250						collection_id,
2251				1,2251						1,
2252				variable_data.clone()2252						variable_data.clone()
2253			),2253					),
2254			Error::<Test>::MetadataUpdateDenied2254					Error::<Test>::MetadataUpdateDenied
2255		);2255				);
2256			});
2257		}
22562258
2257#[test]2259		#[test]
2258fn collection_transfer_flag_works_neg() {2260		fn collection_transfer_flag_works_neg() {
2259	new_test_ext().execute_with(|| {2261			new_test_ext().execute_with(|| {
2260		let origin1 = Origin::signed(1);2262				let origin1 = Origin::signed(1);
22612263
2262		let collection_id = create_test_collection(&CollectionMode::NFT, 1);2264				let collection_id = create_test_collection(&CollectionMode::NFT, 1);
2263		assert_ok!(TemplateModule::set_transfers_enabled_flag(2265				assert_ok!(TemplateModule::set_transfers_enabled_flag(
2264			origin1, 1, false2266					origin1, 1, false
2265		));2267				));
22662268
2267		let data = default_nft_data();2269				let data = default_nft_data();
2268		create_test_item(collection_id, &data.into());2270				create_test_item(collection_id, &data.into());
2269		assert_eq!(TemplateModule::balance_count(1, 1), 1);2271				assert_eq!(TemplateModule::balance_count(1, 1), 1);
2270		assert_eq!(TemplateModule::address_tokens(1, 1), [1]);2272				assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
22712273
2272		let origin1 = Origin::signed(1);2274				let origin1 = Origin::signed(1);
22732275
2274		// default scenario2276				// default scenario
2275		assert_noop!(2277				assert_noop!(
2276			TemplateModule::transfer(origin1, account(2), 1, 1, 1000),2278					TemplateModule::transfer(origin1, account(2), 1, 1, 1000),
2277			Error::<Test>::TransferNotAllowed2279					Error::<Test>::TransferNotAllowed
2278		);2280				);
2279		assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(1));2281				assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(1));
2280		assert_eq!(TemplateModule::balance_count(1, 1), 1);2282				assert_eq!(TemplateModule::balance_count(1, 1), 1);
2281		assert_eq!(TemplateModule::balance_count(1, 2), 0);2283				assert_eq!(TemplateModule::balance_count(1, 2), 0);
22822284
2283		assert_eq!(TemplateModule::address_tokens(1, 1), [1]);2285				assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
2286			});
2287		}
2284	});2288	});
2285}2289}
22862290

modifiedtests/src/addCollectionAdmin.test.tsdiff before after both

4//4//
55
6import { ApiPromise } from '@polkadot/api';6import { ApiPromise } from '@polkadot/api';
7import BN from 'bn.js';
8import chai from 'chai';7import chai from 'chai';
9import chaiAsPromised from 'chai-as-promised';8import chaiAsPromised from 'chai-as-promised';
10import privateKey from './substrate/privateKey';9import privateKey from './substrate/privateKey';

modifiedtests/src/collision-tests/adminLimitsOff.test.tsdiff before after both

1import { IKeyringPair } from '@polkadot/types/types';1import { IKeyringPair } from '@polkadot/types/types';
2import BN from 'bn.js';
3import chai from 'chai';2import chai from 'chai';
4import chaiAsPromised from 'chai-as-promised';3import chaiAsPromised from 'chai-as-promised';
5import privateKey from '../substrate/privateKey';4import privateKey from '../substrate/privateKey';

modifiedtests/src/eth/nonFungible.test.tsdiff before after both

6import privateKey from '../substrate/privateKey';6import privateKey from '../substrate/privateKey';
7import { approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE } from '../util/helpers';7import { approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE } from '../util/helpers';
8import { collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth } from './util/helpers';8import { collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth } from './util/helpers';
9import { evmToAddress } from '@polkadot/util-crypto';
10import nonFungibleAbi from './nonFungibleAbi.json';9import nonFungibleAbi from './nonFungibleAbi.json';
11import { expect } from 'chai';10import { expect } from 'chai';
12import waitNewBlocks from '../substrate/wait-new-blocks';11import waitNewBlocks from '../substrate/wait-new-blocks';

modifiedtests/src/util/helpers.tsdiff before after both

1084  await setMintPermissionExpectSuccess(sender, collectionId, true);1084  await setMintPermissionExpectSuccess(sender, collectionId, true);
1085}1085}
1086
1087export async function addCollectionAdminExpectSuccess(sender: IKeyringPair, collectionId: number, address: IKeyringPair) {
1088  await usingApi(async (api) => {
1089    const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(address.address));
1090    const events = await submitTransactionAsync(sender, changeAdminTx);
1091    const result = getCreateCollectionResult(events);
1092    expect(result.success).to.be.true;
1093  });
1094}
10951086
1096export async function setMintPermissionExpectFailure(sender: IKeyringPair, collectionId: number, enabled: boolean) {1087export async function setMintPermissionExpectFailure(sender: IKeyringPair, collectionId: number, enabled: boolean) {
1097  await usingApi(async (api) => {1088  await usingApi(async (api) => {