git.delta.rocks / unique-network / refs/commits / 430a12fa7812

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -884,7 +884,7 @@
 
 			Self::create_item_internal(&sender, &collection, &owner, data)?;
 
-			Self::submit_logs(collection)?;
+			// Self::submit_logs(collection)?;
 			Ok(())
 		}
 
@@ -918,7 +918,7 @@
 
 			Self::create_multiple_items_internal(&sender, &collection, &owner, items_data)?;
 
-			Self::submit_logs(collection)?;
+			// Self::submit_logs(collection)?;
 			Ok(())
 		}
 
@@ -944,7 +944,7 @@
 
 			Self::burn_item_internal(&sender, &target_collection, item_id, value)?;
 
-			Self::submit_logs(target_collection)?;
+			// Self::submit_logs(target_collection)?;
 			Ok(())
 		}
 
@@ -979,7 +979,7 @@
 
 			Self::transfer_internal(&sender, &recipient, &collection, item_id, value)?;
 
-			Self::submit_logs(collection)?;
+			// Self::submit_logs(collection)?;
 			Ok(())
 		}
 
@@ -1006,7 +1006,7 @@
 
 			Self::approve_internal(&sender, &spender, &collection, item_id, amount)?;
 
-			Self::submit_logs(collection)?;
+			// Self::submit_logs(collection)?;
 			Ok(())
 		}
 
@@ -1037,7 +1037,7 @@
 
 			Self::transfer_from_internal(&sender, &from, &recipient, &collection, item_id, value)?;
 
-			Self::submit_logs(collection)?;
+			// Self::submit_logs(collection)?;
 			Ok(())
 		}
 		// #[weight = 0]

--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -154,7 +154,7 @@
 	transaction_version: 1,
 };
 
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 1200;
 
 pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
 

--- a/tests/src/addToContractWhiteList.test.ts
+++ b/tests/src/addToContractWhiteList.test.ts
@@ -17,7 +17,7 @@
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
-describe('Integration Test addToContractWhiteList', () => {
+describe.skip('Integration Test addToContractWhiteList', () => {
 
   it('Add an address to a contract white list', async () => {
     await usingApi(async api => {
@@ -56,7 +56,7 @@
   });
 });
 
-describe('Negative Integration Test addToContractWhiteList', () => {
+describe.skip('Negative Integration Test addToContractWhiteList', () => {
 
   it('Add an address to a white list of a non-contract', async () => {
     await usingApi(async api => {

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.)

--- a/tests/src/toggleContractWhiteList.test.ts
+++ b/tests/src/toggleContractWhiteList.test.ts
@@ -21,7 +21,7 @@
 const value = 0;
 const gasLimit = 3000n * 1000000n;
 
-describe('Integration Test toggleContractWhiteList', () => {
+describe.skip('Integration Test toggleContractWhiteList', () => {
 
   it('Enable white list contract mode', async () => {
     await usingApi(async api => {
@@ -121,7 +121,7 @@
 
 });
 
-describe('Negative Integration Test toggleContractWhiteList', () => {
+describe.skip('Negative Integration Test toggleContractWhiteList', () => {
 
   it('Enable white list for a non-contract', async () => {
     await usingApi(async api => {

--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -895,7 +895,8 @@
       const createData = { refungible: { const_data: [], variable_data: [], pieces: 100 } };
       tx = api.tx.nft.createItem(collectionId, to, createData);
     } else {
-      tx = api.tx.nft.createItem(collectionId, to, createMode);
+      const createData = { nft: { const_data: [], variable_data: [] } };
+      tx = api.tx.nft.createItem(collectionId, to, createData);
     }
 
     const events = await submitTransactionAsync(sender, tx);