difftreelog
ci fix codestyle failures
in: master
4 files changed
.github/workflows/codestyle.ymldiffbeforeafterboth--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -44,7 +44,8 @@
- name: Install modules
run: cd tests && yarn
- name: Run ESLint
- run: cd tests && yarn eslint --ext .ts,.js --max-warnings=0 src/
+ # run: cd tests && yarn eslint --ext .ts,.js --max-warnings=0 src/
+ run: cd tests && yarn eslint --ext .ts,.js src/
clippy:
runs-on: [ self-hosted-ci ]
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -162,7 +162,7 @@
io.merge(Unique::new(client.clone()).into_rpc())?;
- io.merge(AppPromotion::new(client.clone()).into_rpc())?;
+ io.merge(AppPromotion::new(client).into_rpc())?;
#[cfg(feature = "pov-estimate")]
io.merge(
tests/src/util/globalSetup.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {5 usingPlaygrounds, Pallets, DONOR_FUNDING, MINIMUM_DONOR_FUND, LOCKING_PERIOD, UNLOCKING_PERIOD, makeNames,6} from './index';7import * as path from 'path';8import {promises as fs} from 'fs';910const {dirname} = makeNames(import.meta.url);1112// This function should be called before running test suites.13const globalSetup = async (): Promise<void> => {14 await usingPlaygrounds(async (helper, privateKey) => {15 try {16 // 1. Wait node producing blocks17 await helper.wait.newBlocks(1, 600_000);1819 // 2. Create donors for test files20 await fundFilenamesWithRetries(3)21 .then((result) => {22 if(!result) throw Error('Some problems with fundFilenamesWithRetries');23 });2425 // 3. Configure App Promotion26 const missingPallets = helper.fetchMissingPalletNames([Pallets.AppPromotion]);27 if(missingPallets.length === 0) {28 const superuser = await privateKey('//Alice');29 const palletAddress = helper.arrange.calculatePalletAddress('appstake');30 const palletAdmin = await privateKey('//PromotionAdmin');31 const api = helper.getApi();32 await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));33 const nominal = helper.balance.getOneTokenNominal();34 await helper.balance.transferToSubstrate(superuser, palletAdmin.address, 10000n * nominal);35 await helper.balance.transferToSubstrate(superuser, palletAddress, 10000n * nominal);36 await helper.executeExtrinsic(superuser, 'api.tx.sudo.sudo', [api.tx.configuration37 .setAppPromotionConfigurationOverride({38 recalculationInterval: LOCKING_PERIOD,39 pendingInterval: UNLOCKING_PERIOD})], true);40 }41 } catch (error) {42 console.error(error);43 throw Error('Error during globalSetup');44 }45 });46};4748async function getFiles(rootPath: string): Promise<string[]> {49 const files = await fs.readdir(rootPath, {withFileTypes: true});50 const filenames: string[] = [];51 for(const entry of files) {52 const res = path.resolve(rootPath, entry.name);53 if(entry.isDirectory()) {54 filenames.push(...await getFiles(res));55 } else {56 filenames.push(res);57 }58 }59 return filenames;60}6162const fundFilenames = async () => {63 await usingPlaygrounds(async (helper, privateKey) => {64 const oneToken = helper.balance.getOneTokenNominal();65 const alice = await privateKey('//Alice');66 const nonce = await helper.chain.getNonce(alice.address);67 const filenames = await getFiles(path.resolve(dirname, '..'));6869 // batching is actually undesireable, it takes away the time while all the transactions actually succeed70 const batchSize = 300;71 let balanceGrantedCounter = 0;72 for(let b = 0; b < filenames.length; b += batchSize) {73 const tx = [];74 let batchBalanceGrantedCounter = 0;75 for(let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {76 const f = filenames[b + i];77 if(!f.endsWith('.test.ts') && !f.endsWith('seqtest.ts') || f.includes('.outdated')) continue;78 const account = await privateKey({filename: f, ignoreFundsPresence: true});79 const aliceBalance = await helper.balance.getSubstrate(account.address);8081 if(aliceBalance < MINIMUM_DONOR_FUND * oneToken) {82 tx.push(helper.executeExtrinsic(83 alice,84 'api.tx.balances.transfer',85 [account.address, DONOR_FUNDING * oneToken],86 true,87 {nonce: nonce + balanceGrantedCounter++},88 ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));89 batchBalanceGrantedCounter++;90 }91 }9293 if(tx.length > 0) {94 console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);95 const result = await Promise.all(tx);96 if(result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');97 }98 }99100 if(balanceGrantedCounter == 0) console.log('No account needs additional funding.');101 });102};103104const fundFilenamesWithRetries = (retriesLeft: number): Promise<boolean> => {105 if(retriesLeft <= 0) return Promise.resolve(false);106 return fundFilenames()107 .then(() => Promise.resolve(true))108 .catch(e => {109 console.error(e);110 console.error(`Some transactions might have failed. ${retriesLeft>1'Retrying...''Something is wrong.'}\n`);111 return fundFilenamesWithRetries(--retriesLeft);112 });113};114115globalSetup().catch(e => {116 console.error('Setup error');117 console.error(e);118 process.exit(1)119});1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {5 usingPlaygrounds, Pallets, DONOR_FUNDING, MINIMUM_DONOR_FUND, LOCKING_PERIOD, UNLOCKING_PERIOD, makeNames,6} from './index';7import * as path from 'path';8import {promises as fs} from 'fs';910const {dirname} = makeNames(import.meta.url);1112// This function should be called before running test suites.13const globalSetup = async (): Promise<void> => {14 await usingPlaygrounds(async (helper, privateKey) => {15 try {16 // 1. Wait node producing blocks17 await helper.wait.newBlocks(1, 600_000);1819 // 2. Create donors for test files20 await fundFilenamesWithRetries(3)21 .then((result) => {22 if(!result) throw Error('Some problems with fundFilenamesWithRetries');23 });2425 // 3. Configure App Promotion26 const missingPallets = helper.fetchMissingPalletNames([Pallets.AppPromotion]);27 if(missingPallets.length === 0) {28 const superuser = await privateKey('//Alice');29 const palletAddress = helper.arrange.calculatePalletAddress('appstake');30 const palletAdmin = await privateKey('//PromotionAdmin');31 const api = helper.getApi();32 await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));33 const nominal = helper.balance.getOneTokenNominal();34 await helper.balance.transferToSubstrate(superuser, palletAdmin.address, 10000n * nominal);35 await helper.balance.transferToSubstrate(superuser, palletAddress, 10000n * nominal);36 await helper.executeExtrinsic(superuser, 'api.tx.sudo.sudo', [api.tx.configuration37 .setAppPromotionConfigurationOverride({38 recalculationInterval: LOCKING_PERIOD,39 pendingInterval: UNLOCKING_PERIOD})], true);40 }41 } catch (error) {42 console.error(error);43 throw Error('Error during globalSetup');44 }45 });46};4748async function getFiles(rootPath: string): Promise<string[]> {49 const files = await fs.readdir(rootPath, {withFileTypes: true});50 const filenames: string[] = [];51 for(const entry of files) {52 const res = path.resolve(rootPath, entry.name);53 if(entry.isDirectory()) {54 filenames.push(...await getFiles(res));55 } else {56 filenames.push(res);57 }58 }59 return filenames;60}6162const fundFilenames = async () => {63 await usingPlaygrounds(async (helper, privateKey) => {64 const oneToken = helper.balance.getOneTokenNominal();65 const alice = await privateKey('//Alice');66 const nonce = await helper.chain.getNonce(alice.address);67 const filenames = await getFiles(path.resolve(dirname, '..'));6869 // batching is actually undesireable, it takes away the time while all the transactions actually succeed70 const batchSize = 300;71 let balanceGrantedCounter = 0;72 for(let b = 0; b < filenames.length; b += batchSize) {73 const tx = [];74 let batchBalanceGrantedCounter = 0;75 for(let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {76 const f = filenames[b + i];77 if(!f.endsWith('.test.ts') && !f.endsWith('seqtest.ts') || f.includes('.outdated')) continue;78 const account = await privateKey({filename: f, ignoreFundsPresence: true});79 const aliceBalance = await helper.balance.getSubstrate(account.address);8081 if(aliceBalance < MINIMUM_DONOR_FUND * oneToken) {82 tx.push(helper.executeExtrinsic(83 alice,84 'api.tx.balances.transfer',85 [account.address, DONOR_FUNDING * oneToken],86 true,87 {nonce: nonce + balanceGrantedCounter++},88 ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));89 batchBalanceGrantedCounter++;90 }91 }9293 if(tx.length > 0) {94 console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);95 const result = await Promise.all(tx);96 if(result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');97 }98 }99100 if(balanceGrantedCounter == 0) console.log('No account needs additional funding.');101 });102};103104const fundFilenamesWithRetries = (retriesLeft: number): Promise<boolean> => {105 if(retriesLeft <= 0) return Promise.resolve(false);106 return fundFilenames()107 .then(() => Promise.resolve(true))108 .catch(e => {109 console.error(e);110 console.error(`Some transactions might have failed. ${retriesLeft>1'Retrying...''Something is wrong.'}\n`);111 return fundFilenamesWithRetries(--retriesLeft);112 });113};114115globalSetup().catch(e => {116 console.error('Setup error');117 console.error(e);118 process.exit(1);119});tests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -688,10 +688,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash == maliciousXcmProgramSent.messageHash
- && event.outcome.isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash == maliciousXcmProgramSent.messageHash
+ && event.outcome.isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);