--- 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 => { --- a/tests/src/change-collection-owner.test.ts +++ b/tests/src/change-collection-owner.test.ts @@ -12,49 +12,49 @@ chai.use(chaiAsPromised); const expect = chai.expect; -describe('Integration Test changeCollectionOwner(collection_id, new_owner):', () => { - it('Changing owner changes owner.', async () => { +describe.only('Integration Test changeCollectionOwner(collection_id, new_owner):', () => { + it('Changing owner changes owner address', async () => { await usingApi(async api => { const collectionId = await createCollectionExpectSuccess(); const alice = privateKey('//Alice'); const bob = privateKey('//Bob'); const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON(); - expect(collection.Owner).to.be.deep.eq(normalizeAccountId(alice.address)); + expect(collection.Owner).to.be.deep.eq(alice.address); - const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address)); + const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address); await submitTransactionAsync(alice, changeOwnerTx); const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON(); - expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(normalizeAccountId(bob.address)); + expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(bob.address); }); }); }); -describe('Negative Integration Test changeCollectionOwner(collection_id, new_owner):', () => { +describe.only('Negative Integration Test changeCollectionOwner(collection_id, new_owner):', () => { it('Not owner can\'t change owner.', async () => { await usingApi(async api => { const collectionId = await createCollectionExpectSuccess(); const alice = privateKey('//Alice'); const bob = privateKey('//Bob'); - const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address)); + const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address); await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected; const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON(); - expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(normalizeAccountId(alice.address)); + expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(alice.address); // Verifying that nothing bad happened (network is live, new collections can be created, etc.) await createCollectionExpectSuccess(); }); }); - it('Can\'t change owner of not existing collection.', async () => { + it('Can\'t change owner of a non-existing collection.', async () => { await usingApi(async api => { const collectionId = (1<<32) - 1; const alice = privateKey('//Alice'); const bob = privateKey('//Bob'); - const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address)); + const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address); await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected; // 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);