`430a12fa7812`

6 files changed

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

884884
885			Self::create_item_internal(&sender, &collection, &owner, data)?;885			Self::create_item_internal(&sender, &collection, &owner, data)?;
886886
887			Self::submit_logs(collection)?;887			// Self::submit_logs(collection)?;
888			Ok(())888			Ok(())
889		}889		}
890890
918918
919			Self::create_multiple_items_internal(&sender, &collection, &owner, items_data)?;919			Self::create_multiple_items_internal(&sender, &collection, &owner, items_data)?;
920920
921			Self::submit_logs(collection)?;921			// Self::submit_logs(collection)?;
922			Ok(())922			Ok(())
923		}923		}
924924
944944
945			Self::burn_item_internal(&sender, &target_collection, item_id, value)?;945			Self::burn_item_internal(&sender, &target_collection, item_id, value)?;
946946
947			Self::submit_logs(target_collection)?;947			// Self::submit_logs(target_collection)?;
948			Ok(())948			Ok(())
949		}949		}
950950
979979
980			Self::transfer_internal(&sender, &recipient, &collection, item_id, value)?;980			Self::transfer_internal(&sender, &recipient, &collection, item_id, value)?;
981981
982			Self::submit_logs(collection)?;982			// Self::submit_logs(collection)?;
983			Ok(())983			Ok(())
984		}984		}
985985
10061006
1007			Self::approve_internal(&sender, &spender, &collection, item_id, amount)?;1007			Self::approve_internal(&sender, &spender, &collection, item_id, amount)?;
10081008
1009			Self::submit_logs(collection)?;1009			// Self::submit_logs(collection)?;
1010			Ok(())1010			Ok(())
1011		}1011		}
10121012
10371037
1038			Self::transfer_from_internal(&sender, &from, &recipient, &collection, item_id, value)?;1038			Self::transfer_from_internal(&sender, &from, &recipient, &collection, item_id, value)?;
10391039
1040			Self::submit_logs(collection)?;1040			// Self::submit_logs(collection)?;
1041			Ok(())1041			Ok(())
1042		}1042		}
1043		// #[weight = 0]1043		// #[weight = 0]

modifiedruntime/src/lib.rsdiff before after both

154	transaction_version: 1,154	transaction_version: 1,
155};155};
156156
157pub const MILLISECS_PER_BLOCK: u64 = 12000;157pub const MILLISECS_PER_BLOCK: u64 = 1200;
158158
159pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;159pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
160160

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

17chai.use(chaiAsPromised);17chai.use(chaiAsPromised);
18const expect = chai.expect;18const expect = chai.expect;
1919
20describe('Integration Test addToContractWhiteList', () => {20describe.skip('Integration Test addToContractWhiteList', () => {
2121
22  it('Add an address to a contract white list', async () => {22  it('Add an address to a contract white list', async () => {
23    await usingApi(async api => {23    await usingApi(async api => {
56  });56  });
57});57});
5858
59describe('Negative Integration Test addToContractWhiteList', () => {59describe.skip('Negative Integration Test addToContractWhiteList', () => {
6060
61  it('Add an address to a white list of a non-contract', async () => {61  it('Add an address to a white list of a non-contract', async () => {
62    await usingApi(async api => {62    await usingApi(async api => {

modifiedtests/src/change-collection-owner.test.tsdiff before after both

12chai.use(chaiAsPromised);12chai.use(chaiAsPromised);
13const expect = chai.expect;13const expect = chai.expect;
1414
15describe('Integration Test changeCollectionOwner(collection_id, new_owner):', () => {15describe.only('Integration Test changeCollectionOwner(collection_id, new_owner):', () => {
16  it('Changing owner changes owner.', async () => {16  it('Changing owner changes owner address', async () => {
17    await usingApi(async api => {17    await usingApi(async api => {
18      const collectionId = await createCollectionExpectSuccess();18      const collectionId = await createCollectionExpectSuccess();
19      const alice = privateKey('//Alice');19      const alice = privateKey('//Alice');
20      const bob = privateKey('//Bob');20      const bob = privateKey('//Bob');
2121
22      const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();22      const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
23      expect(collection.Owner).to.be.deep.eq(normalizeAccountId(alice.address));23      expect(collection.Owner).to.be.deep.eq(alice.address);
2424
25      const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address));25      const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
26      await submitTransactionAsync(alice, changeOwnerTx);26      await submitTransactionAsync(alice, changeOwnerTx);
2727
28      const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON();28      const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON();
29      expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(normalizeAccountId(bob.address));29      expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(bob.address);
30    });30    });
31  });31  });
32});32});
3333
34describe('Negative Integration Test changeCollectionOwner(collection_id, new_owner):', () => {34describe.only('Negative Integration Test changeCollectionOwner(collection_id, new_owner):', () => {
35  it('Not owner can\'t change owner.', async () => {35  it('Not owner can\'t change owner.', async () => {
36    await usingApi(async api => {36    await usingApi(async api => {
37      const collectionId = await createCollectionExpectSuccess();37      const collectionId = await createCollectionExpectSuccess();
38      const alice = privateKey('//Alice');38      const alice = privateKey('//Alice');
39      const bob = privateKey('//Bob');39      const bob = privateKey('//Bob');
4040
41      const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address));41      const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
42      await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;42      await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
4343
44      const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON();44      const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON();
45      expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(normalizeAccountId(alice.address));45      expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(alice.address);
4646
47      // Verifying that nothing bad happened (network is live, new collections can be created, etc.)47      // Verifying that nothing bad happened (network is live, new collections can be created, etc.)
48      await createCollectionExpectSuccess();48      await createCollectionExpectSuccess();
49    });49    });
50  });50  });
51  it('Can\'t change owner of not existing collection.', async () => {51  it('Can\'t change owner of a non-existing collection.', async () => {
52    await usingApi(async api => {52    await usingApi(async api => {
53      const collectionId = (1<<32) - 1;53      const collectionId = (1<<32) - 1;
54      const alice = privateKey('//Alice');54      const alice = privateKey('//Alice');
55      const bob = privateKey('//Bob');55      const bob = privateKey('//Bob');
5656
57      const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address));57      const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
58      await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;58      await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
5959
60      // Verifying that nothing bad happened (network is live, new collections can be created, etc.)60      // Verifying that nothing bad happened (network is live, new collections can be created, etc.)

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

21const value = 0;21const value = 0;
22const gasLimit = 3000n * 1000000n;22const gasLimit = 3000n * 1000000n;
2323
24describe('Integration Test toggleContractWhiteList', () => {24describe.skip('Integration Test toggleContractWhiteList', () => {
2525
26  it('Enable white list contract mode', async () => {26  it('Enable white list contract mode', async () => {
27    await usingApi(async api => {27    await usingApi(async api => {
121121
122});122});
123123
124describe('Negative Integration Test toggleContractWhiteList', () => {124describe.skip('Negative Integration Test toggleContractWhiteList', () => {
125125
126  it('Enable white list for a non-contract', async () => {126  it('Enable white list for a non-contract', async () => {
127    await usingApi(async api => {127    await usingApi(async api => {

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

895      const createData = { refungible: { const_data: [], variable_data: [], pieces: 100 } };895      const createData = { refungible: { const_data: [], variable_data: [], pieces: 100 } };
896      tx = api.tx.nft.createItem(collectionId, to, createData);896      tx = api.tx.nft.createItem(collectionId, to, createData);
897    } else {897    } else {
898      const createData = { nft: { const_data: [], variable_data: [] } };
898      tx = api.tx.nft.createItem(collectionId, to, createMode);899      tx = api.tx.nft.createItem(collectionId, to, createData);
899    }900    }
900901
901    const events = await submitTransactionAsync(sender, tx);902    const events = await submitTransactionAsync(sender, tx);