--- a/tests/package.json +++ b/tests/package.json @@ -84,6 +84,7 @@ "@polkadot/util-crypto": "^9.1.1", "bignumber.js": "^9.0.2", "chai-as-promised": "^7.1.1", + "find-process": "^1.4.7", "solc": "^0.8.13", "web3": "^1.7.3" }, --- a/tests/src/nesting/migration-check.test.ts +++ b/tests/src/nesting/migration-check.test.ts @@ -7,27 +7,27 @@ import waitNewBlocks from '../substrate/wait-new-blocks'; // todo skip -describe.skip('Migration testing for pallet-common', () => { +describe('Migration testing for pallet-common', () => { let alice: IKeyringPair; before(async() => { - await usingApi(async api => { + await usingApi(async () => { alice = privateKey('//Alice'); }); }); it('Preserves collection settings', async () => { - let old_version: number; - let collection_id: number; - let collection_old: any; + let oldVersion: number; + let collectionId: number; + let collectionOld: any; await usingApi(async api => { // Create a collection for comparison before and after the upgrade const tx = api.tx.unique.createCollectionEx({ mode: 'NFT', access: 'AllowList', - name: strToUTF16("Mojave Pictures"), - description: strToUTF16("$2.2 billion power plant!"), + name: strToUTF16('Mojave Pictures'), + description: strToUTF16('$2.2 billion power plant!'), tokenPrefix: '0x0002030', offchainSchema: '0x111111', schemaVersion: 'Unique', @@ -40,53 +40,61 @@ }); const events = await submitTransactionAsync(alice, tx); const result = getCreateCollectionResult(events); - collection_id = result.collectionId; + collectionId = result.collectionId; // Get the pre-upgrade collection info - collection_old = (await api.query.common.collectionById(collection_id)).toJSON(); + collectionOld = (await api.query.common.collectionById(collectionId)).toJSON(); // Get the pre-upgrade spec version - old_version = (api.consts.system.version.toJSON() as any).specVersion; + oldVersion = (api.consts.system.version.toJSON() as any).specVersion; }); - console.log(`Now waiting for the parachain upgrade from ${old_version!}...`); + console.log(`Now waiting for the parachain upgrade from ${oldVersion!}...`); - let new_version = old_version!; - let connection_fail_counter = 0; + let newVersion = oldVersion!; + let connectionFailCounter = 0; + + // Cooperate with polkadot-launch if it's running (assuming custom name change), and send a custom signal + const find = require('find-process'); + find('name', 'polkadot-launch', true).then(function (list: [any]) { + for (let proc of list) { + process.kill(proc.pid, 'SIGUSR1'); + } + }) // And wait for the parachain upgrade - while (new_version == old_version! && connection_fail_counter < 2) { + while (newVersion == oldVersion! && connectionFailCounter < 2) { try { await usingApi(async api => { await waitNewBlocks(api); - new_version = (api.consts.system.version.toJSON() as any).specVersion; + newVersion = (api.consts.system.version.toJSON() as any).specVersion; }); } catch (_) { - connection_fail_counter++; - await new Promise( resolve => setTimeout(resolve, 12000) ); + connectionFailCounter++; + await new Promise(resolve => setTimeout(resolve, 12000)); } } await usingApi(async api => { - const collection_new = (await api.query.common.collectionById(collection_id)).toJSON() as any; + const collectionNew = (await api.query.common.collectionById(collectionId)).toJSON() as any; // Make sure the extra fields are what they should be - const variable_on_chain_schema = await api.query.common.collectionData(collection_id, "VariableOnChainSchema"); - const const_on_chain_schema = await api.query.common.collectionData(collection_id, "ConstOnChainSchema"); - const offchain_schema = await api.query.common.collectionData(collection_id, "OffchainSchema"); + const variableOnChainSchema = await api.query.common.collectionData(collectionId, 'VariableOnChainSchema'); + const constOnChainSchema = await api.query.common.collectionData(collectionId, 'ConstOnChainSchema'); + const offchainSchema = await api.query.common.collectionData(collectionId, 'OffchainSchema'); - expect(variable_on_chain_schema.toHex()).to.be.deep.equal((collection_old.variableOnChainSchema)); - expect(const_on_chain_schema.toHex()).to.be.deep.equal(collection_old.constOnChainSchema); - expect(offchain_schema.toHex()).to.be.deep.equal(collection_old.offchainSchema); - expect(collection_new).to.have.nested.property('limits.nestingRule'); + expect(variableOnChainSchema.toHex()).to.be.deep.equal((collectionOld.variableOnChainSchema)); + expect(constOnChainSchema.toHex()).to.be.deep.equal(collectionOld.constOnChainSchema); + expect(offchainSchema.toHex()).to.be.deep.equal(collectionOld.offchainSchema); + expect(collectionNew).to.have.nested.property('limits.nestingRule'); // Get rid of extra fields to perform comparison on the rest of the collection - delete collection_new.limits.nestingRule; - delete collection_old.constOnChainSchema; - delete collection_old.offchainSchema; - delete collection_old.variableOnChainSchema; + delete collectionNew.limits.nestingRule; + delete collectionOld.constOnChainSchema; + delete collectionOld.offchainSchema; + delete collectionOld.variableOnChainSchema; - expect(collection_new).to.be.deep.equal(collection_old); + expect(collectionNew).to.be.deep.equal(collectionOld); }); }); }); --- a/tests/yarn.lock +++ b/tests/yarn.lock @@ -3698,6 +3698,11 @@ resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== +commander@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" @@ -5054,6 +5059,15 @@ resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ= +find-process@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.4.7.tgz#8c76962259216c381ef1099371465b5b439ea121" + integrity sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg== + dependencies: + chalk "^4.0.0" + commander "^5.1.0" + debug "^4.1.1" + find-up@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"