git.delta.rocks / unique-network / refs/commits / 55d2f5bff434

difftreelog

Style update

str-mv2021-08-31parent: #8057bdd.patch.diff
in: master

6 files changed

modifiedpallets/nft/src/mock.rsdiffbeforeafterboth
--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -98,12 +98,6 @@
 	type WeightInfo = ();
 }
 
-<<<<<<< HEAD
-type Timestamp = pallet_timestamp::Pallet<Test>;
-type Randomness = pallet_randomness_collective_flip::Pallet<Test>;
-
-=======
->>>>>>> origin/develop
 parameter_types! {
 	pub const CollectionCreationPrice: u32 = 0;
 	pub TreasuryAccountId: u64 = 1234;
modifiedpallets/nft/src/tests.rsdiffbeforeafterboth
--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -2080,206 +2080,210 @@
 			Error::<Test>::NoPermission
 		);
 
-#[test]
-fn collection_transfer_flag_works() {
-	new_test_ext().execute_with(|| {
-		let origin1 = Origin::signed(1);
+		#[test]
+		fn collection_transfer_flag_works() {
+			new_test_ext().execute_with(|| {
+				let origin1 = Origin::signed(1);
 
-		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-		assert_ok!(TemplateModule::set_transfers_enabled_flag(origin1, 1, true));
+				let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+				assert_ok!(TemplateModule::set_transfers_enabled_flag(origin1, 1, true));
 
-		let data = default_nft_data();
-		create_test_item(collection_id, &data.into());
-		assert_eq!(TemplateModule::balance_count(1, 1), 1);
-		assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+				let data = default_nft_data();
+				create_test_item(collection_id, &data.into());
+				assert_eq!(TemplateModule::balance_count(1, 1), 1);
+				assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
 
-		let origin1 = Origin::signed(1);
+				let origin1 = Origin::signed(1);
 
-		// default scenario
-		assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1000));
-		assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));
-		assert_eq!(TemplateModule::balance_count(1, 1), 0);
-		assert_eq!(TemplateModule::balance_count(1, 2), 1);
+				// default scenario
+				assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1000));
+				assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));
+				assert_eq!(TemplateModule::balance_count(1, 1), 0);
+				assert_eq!(TemplateModule::balance_count(1, 2), 1);
 
-		assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
-	});
-}
+				assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
+			});
+		}
 
-#[test]
-fn set_variable_meta_data_on_nft_with_admin_flag() {
-	new_test_ext().execute_with(|| {
-		default_limits();
+		#[test]
+		fn set_variable_meta_data_on_nft_with_admin_flag() {
+			new_test_ext().execute_with(|| {
+				default_limits();
 
-		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
+				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
 
-		let origin1 = Origin::signed(1);
-		let origin2 = Origin::signed(2);
+				let origin1 = Origin::signed(1);
+				let origin2 = Origin::signed(2);
 
-		assert_ok!(TemplateModule::set_mint_permission(
-			origin2.clone(),
-			collection_id,
-			true
-		));
-		assert_ok!(TemplateModule::add_to_white_list(
-			origin2.clone(),
-			collection_id,
-			account(1)
-		));
+				assert_ok!(TemplateModule::set_mint_permission(
+					origin2.clone(),
+					collection_id,
+					true
+				));
+				assert_ok!(TemplateModule::add_to_white_list(
+					origin2.clone(),
+					collection_id,
+					account(1)
+				));
 
-		assert_ok!(TemplateModule::add_collection_admin(
-			origin2.clone(),
-			collection_id,
-			account(1)
-		));
+				assert_ok!(TemplateModule::add_collection_admin(
+					origin2.clone(),
+					collection_id,
+					account(1)
+				));
 
-		let data = default_nft_data();
-		create_test_item(1, &data.into());
+				let data = default_nft_data();
+				create_test_item(1, &data.into());
 
-		TemplateModule::set_meta_update_permission_flag(
-			origin2.clone(),
-			collection_id,
-			MetaUpdatePermission::Admin,
-		);
+				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(
-			origin1,
-			collection_id,
-			1,
-			variable_data.clone()
-		));
+				let variable_data = b"test set_variable_meta_data method.".to_vec();
+				assert_ok!(TemplateModule::set_variable_meta_data(
+					origin1,
+					collection_id,
+					1,
+					variable_data.clone()
+				));
 
-		assert_eq!(
-			TemplateModule::nft_item_id(collection_id, 1)
-				.unwrap()
-				.variable_data,
-			variable_data
-		);
-	});
-}
+				assert_eq!(
+					TemplateModule::nft_item_id(collection_id, 1)
+						.unwrap()
+						.variable_data,
+					variable_data
+				);
+			});
+		}
 
-#[test]
-fn set_variable_meta_data_on_nft_with_admin_flag_neg() {
-	new_test_ext().execute_with(|| {
-		default_limits();
+		#[test]
+		fn set_variable_meta_data_on_nft_with_admin_flag_neg() {
+			new_test_ext().execute_with(|| {
+				default_limits();
 
-		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
+				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
 
-		let origin1 = Origin::signed(1);
-		let origin2 = Origin::signed(2);
+				let origin1 = Origin::signed(1);
+				let origin2 = Origin::signed(2);
 
-		assert_ok!(TemplateModule::set_mint_permission(
-			origin2.clone(),
-			collection_id,
-			true
-		));
-		assert_ok!(TemplateModule::add_to_white_list(
-			origin2.clone(),
-			collection_id,
-			account(1)
-		));
+				assert_ok!(TemplateModule::set_mint_permission(
+					origin2.clone(),
+					collection_id,
+					true
+				));
+				assert_ok!(TemplateModule::add_to_white_list(
+					origin2.clone(),
+					collection_id,
+					account(1)
+				));
 
-		let data = default_nft_data();
-		create_test_item(1, &data.into());
+				let data = default_nft_data();
+				create_test_item(1, &data.into());
 
-		TemplateModule::set_meta_update_permission_flag(
-			origin2.clone(),
-			collection_id,
-			MetaUpdatePermission::Admin,
-		);
+				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!(
-			TemplateModule::set_variable_meta_data(
-				origin1,
-				collection_id,
-				1,
-				variable_data.clone()
-			),
-			Error::<Test>::NoPermission
-		);
-	});
-}
+				let variable_data = b"test set_variable_meta_data method.".to_vec();
+				assert_noop!(
+					TemplateModule::set_variable_meta_data(
+						origin1,
+						collection_id,
+						1,
+						variable_data.clone()
+					),
+					Error::<Test>::NoPermission
+				);
+			});
+		}
 
-#[test]
-fn set_variable_meta_flag_after_freeze() {
-	new_test_ext().execute_with(|| {
-		default_limits();
+		#[test]
+		fn set_variable_meta_flag_after_freeze() {
+			new_test_ext().execute_with(|| {
+				default_limits();
 
-		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
+				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 2, 1);
 
-		let origin2 = Origin::signed(2);
+				let origin2 = Origin::signed(2);
 
-		TemplateModule::set_meta_update_permission_flag(
-			origin2.clone(),
-			collection_id,
-			MetaUpdatePermission::None,
-		);
-		assert_noop!(
-			TemplateModule::set_meta_update_permission_flag(
-				origin2.clone(),
-				collection_id,
-				MetaUpdatePermission::Admin
-			),
-			Error::<Test>::MetadataFlagFrozen
-		);
-	});
-}
+				TemplateModule::set_meta_update_permission_flag(
+					origin2.clone(),
+					collection_id,
+					MetaUpdatePermission::None,
+				);
+				assert_noop!(
+					TemplateModule::set_meta_update_permission_flag(
+						origin2.clone(),
+						collection_id,
+						MetaUpdatePermission::Admin
+					),
+					Error::<Test>::MetadataFlagFrozen
+				);
+			});
+		}
 
-#[test]
-fn set_variable_meta_data_on_nft_with_none_flag_neg() {
-	new_test_ext().execute_with(|| {
-		default_limits();
+		#[test]
+		fn set_variable_meta_data_on_nft_with_none_flag_neg() {
+			new_test_ext().execute_with(|| {
+				default_limits();
 
-		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
-		let origin1 = Origin::signed(1);
+				let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
+				let origin1 = Origin::signed(1);
 
-		let data = default_nft_data();
-		create_test_item(1, &data.into());
+				let data = default_nft_data();
+				create_test_item(1, &data.into());
 
-		TemplateModule::set_meta_update_permission_flag(
-			origin1.clone(),
-			collection_id,
-			MetaUpdatePermission::None,
-		);
+				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!(
-			TemplateModule::set_variable_meta_data(
-				origin1.clone(),
-				collection_id,
-				1,
-				variable_data.clone()
-			),
-			Error::<Test>::MetadataUpdateDenied
-		);
+				let variable_data = b"test set_variable_meta_data method.".to_vec();
+				assert_noop!(
+					TemplateModule::set_variable_meta_data(
+						origin1.clone(),
+						collection_id,
+						1,
+						variable_data.clone()
+					),
+					Error::<Test>::MetadataUpdateDenied
+				);
+			});
+		}
 
-#[test]
-fn collection_transfer_flag_works_neg() {
-	new_test_ext().execute_with(|| {
-		let origin1 = Origin::signed(1);
+		#[test]
+		fn collection_transfer_flag_works_neg() {
+			new_test_ext().execute_with(|| {
+				let origin1 = Origin::signed(1);
 
-		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-		assert_ok!(TemplateModule::set_transfers_enabled_flag(
-			origin1, 1, false
-		));
+				let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+				assert_ok!(TemplateModule::set_transfers_enabled_flag(
+					origin1, 1, false
+				));
 
-		let data = default_nft_data();
-		create_test_item(collection_id, &data.into());
-		assert_eq!(TemplateModule::balance_count(1, 1), 1);
-		assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+				let data = default_nft_data();
+				create_test_item(collection_id, &data.into());
+				assert_eq!(TemplateModule::balance_count(1, 1), 1);
+				assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
 
-		let origin1 = Origin::signed(1);
+				let origin1 = Origin::signed(1);
 
-		// default scenario
-		assert_noop!(
-			TemplateModule::transfer(origin1, account(2), 1, 1, 1000),
-			Error::<Test>::TransferNotAllowed
-		);
-		assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(1));
-		assert_eq!(TemplateModule::balance_count(1, 1), 1);
-		assert_eq!(TemplateModule::balance_count(1, 2), 0);
+				// default scenario
+				assert_noop!(
+					TemplateModule::transfer(origin1, account(2), 1, 1, 1000),
+					Error::<Test>::TransferNotAllowed
+				);
+				assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(1));
+				assert_eq!(TemplateModule::balance_count(1, 1), 1);
+				assert_eq!(TemplateModule::balance_count(1, 2), 0);
 
-		assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+				assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+			});
+		}
 	});
 }
modifiedtests/src/addCollectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -4,7 +4,6 @@
 //
 
 import { ApiPromise } from '@polkadot/api';
-import BN from 'bn.js';
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import privateKey from './substrate/privateKey';
modifiedtests/src/collision-tests/adminLimitsOff.test.tsdiffbeforeafterboth
before · tests/src/collision-tests/adminLimitsOff.test.ts
1import { IKeyringPair } from '@polkadot/types/types';2import BN from 'bn.js';3import chai from 'chai';4import chaiAsPromised from 'chai-as-promised';5import privateKey from '../substrate/privateKey';6import usingApi, { submitTransactionAsync, submitTransactionExpectFailAsync } from '../substrate/substrate-api';7import {8  createCollectionExpectSuccess,9} from '../util/helpers';1011chai.use(chaiAsPromised);12const expect = chai.expect;13let Alice: IKeyringPair;14let Bob: IKeyringPair;15let Ferdie: IKeyringPair;16let Charlie: IKeyringPair;17let Eve: IKeyringPair;18let Dave: IKeyringPair;1920before(async () => {21  await usingApi(async () => {22    Alice = privateKey('//Alice');23    Bob = privateKey('//Bob');24    Ferdie = privateKey('//Ferdie');25    Charlie = privateKey('//Charlie');26    Eve = privateKey('//Eve');27    Dave = privateKey('//Dave');28  });29});3031describe('Admin limit exceeded collection: ', () => {32  // tslint:disable-next-line: max-line-length33  it('In one block, the owner and admin add new admins to the collection more than the limit ', async () => {34    await usingApi(async (api) => {35      const collectionId = await createCollectionExpectSuccess();3637      const chainAdminLimit = (api.consts.nft.collectionAdminsLimit as any).toNumber();38      expect(chainAdminLimit).to.be.equal(5);3940      const changeAdminTx1 = api.tx.nft.addCollectionAdmin(collectionId, Eve.address);41      await submitTransactionAsync(Alice, changeAdminTx1);42      const changeAdminTx2 = api.tx.nft.addCollectionAdmin(collectionId, Dave.address);43      await submitTransactionAsync(Alice, changeAdminTx2);44      const changeAdminTx3 = api.tx.nft.addCollectionAdmin(collectionId, Bob.address);45      await submitTransactionAsync(Alice, changeAdminTx3);4647      const timeoutPromise = (timeout: number) => new Promise((resolve) => setTimeout(resolve, timeout));48      const addAdmOne = api.tx.nft.addCollectionAdmin(collectionId, Ferdie.address);49      const addAdmTwo = api.tx.nft.addCollectionAdmin(collectionId, Charlie.address);50      await Promise.all([51        addAdmOne.signAndSend(Bob),52        addAdmTwo.signAndSend(Alice),53      ]);54      await timeoutPromise(10000);55      const changeAdminTx4 = api.tx.nft.addCollectionAdmin(collectionId, Alice.address);56      // tslint:disable-next-line: no-unused-expression57      expect(submitTransactionExpectFailAsync(Alice, changeAdminTx4)).to.be.rejected;5859      const adminListAfterAddAdmin: any = (await api.query.nft.adminList(collectionId));60      expect(adminListAfterAddAdmin).to.be.contains(Eve.address);61      expect(adminListAfterAddAdmin).to.be.contains(Ferdie.address);62      expect(adminListAfterAddAdmin).not.to.be.contains(Alice.address);63      await timeoutPromise(20000);64    });65  });66});
after · tests/src/collision-tests/adminLimitsOff.test.ts
1import { IKeyringPair } from '@polkadot/types/types';2import chai from 'chai';3import chaiAsPromised from 'chai-as-promised';4import privateKey from '../substrate/privateKey';5import usingApi, { submitTransactionAsync, submitTransactionExpectFailAsync } from '../substrate/substrate-api';6import {7  createCollectionExpectSuccess,8} from '../util/helpers';910chai.use(chaiAsPromised);11const expect = chai.expect;12let Alice: IKeyringPair;13let Bob: IKeyringPair;14let Ferdie: IKeyringPair;15let Charlie: IKeyringPair;16let Eve: IKeyringPair;17let Dave: IKeyringPair;1819before(async () => {20  await usingApi(async () => {21    Alice = privateKey('//Alice');22    Bob = privateKey('//Bob');23    Ferdie = privateKey('//Ferdie');24    Charlie = privateKey('//Charlie');25    Eve = privateKey('//Eve');26    Dave = privateKey('//Dave');27  });28});2930describe('Admin limit exceeded collection: ', () => {31  // tslint:disable-next-line: max-line-length32  it('In one block, the owner and admin add new admins to the collection more than the limit ', async () => {33    await usingApi(async (api) => {34      const collectionId = await createCollectionExpectSuccess();3536      const chainAdminLimit = (api.consts.nft.collectionAdminsLimit as any).toNumber();37      expect(chainAdminLimit).to.be.equal(5);3839      const changeAdminTx1 = api.tx.nft.addCollectionAdmin(collectionId, Eve.address);40      await submitTransactionAsync(Alice, changeAdminTx1);41      const changeAdminTx2 = api.tx.nft.addCollectionAdmin(collectionId, Dave.address);42      await submitTransactionAsync(Alice, changeAdminTx2);43      const changeAdminTx3 = api.tx.nft.addCollectionAdmin(collectionId, Bob.address);44      await submitTransactionAsync(Alice, changeAdminTx3);4546      const timeoutPromise = (timeout: number) => new Promise((resolve) => setTimeout(resolve, timeout));47      const addAdmOne = api.tx.nft.addCollectionAdmin(collectionId, Ferdie.address);48      const addAdmTwo = api.tx.nft.addCollectionAdmin(collectionId, Charlie.address);49      await Promise.all([50        addAdmOne.signAndSend(Bob),51        addAdmTwo.signAndSend(Alice),52      ]);53      await timeoutPromise(10000);54      const changeAdminTx4 = api.tx.nft.addCollectionAdmin(collectionId, Alice.address);55      // tslint:disable-next-line: no-unused-expression56      expect(submitTransactionExpectFailAsync(Alice, changeAdminTx4)).to.be.rejected;5758      const adminListAfterAddAdmin: any = (await api.query.nft.adminList(collectionId));59      expect(adminListAfterAddAdmin).to.be.contains(Eve.address);60      expect(adminListAfterAddAdmin).to.be.contains(Ferdie.address);61      expect(adminListAfterAddAdmin).not.to.be.contains(Alice.address);62      await timeoutPromise(20000);63    });64  });65});
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -6,7 +6,6 @@
 import privateKey from '../substrate/privateKey';
 import { approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE } from '../util/helpers';
 import { collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth } from './util/helpers';
-import { evmToAddress } from '@polkadot/util-crypto';
 import nonFungibleAbi from './nonFungibleAbi.json';
 import { expect } from 'chai';
 import waitNewBlocks from '../substrate/wait-new-blocks';
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -1084,15 +1084,6 @@
   await setMintPermissionExpectSuccess(sender, collectionId, true);
 }
 
-export async function addCollectionAdminExpectSuccess(sender: IKeyringPair, collectionId: number, address: IKeyringPair) {
-  await usingApi(async (api) => {
-    const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(address.address));
-    const events = await submitTransactionAsync(sender, changeAdminTx);
-    const result = getCreateCollectionResult(events);
-    expect(result.success).to.be.true;
-  });
-}
-
 export async function setMintPermissionExpectFailure(sender: IKeyringPair, collectionId: number, enabled: boolean) {
   await usingApi(async (api) => {
     // Run the transaction