git.delta.rocks / unique-network / refs/commits / b5153bb1bb07

difftreelog

resolve merge conflict

Alexander Aksenov2022-09-12parents: #d2c56f6 #c4493f1.patch.diff
in: master

3 files changed

modified.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth
--- a/.github/workflows/dev-build-tests_v2.yml
+++ b/.github/workflows/dev-build-tests_v2.yml
@@ -73,7 +73,6 @@
           yarn add mochawesome
           echo "Ready to start tests"
           node scripts/readyness.js
-          echo "Ready to start tests"
           yarn polkadot-types
           NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
         env:
modified.github/workflows/node-only-update_v2.ymldiffbeforeafterboth
--- a/.github/workflows/node-only-update_v2.yml
+++ b/.github/workflows/node-only-update_v2.yml
@@ -163,6 +163,7 @@
           yarn add mochawesome
           node scripts/readyness.js
           echo "Ready to start tests"
+          yarn polkadot-types
           NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
         env:
           RPC_URL: http://127.0.0.1:9933/
@@ -239,6 +240,7 @@
           yarn add mochawesome
           node scripts/readyness.js
           echo "Ready to start tests"
+          yarn polkadot-types
           NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
         env:
           RPC_URL: http://127.0.0.1:9933/
modifiedtests/scripts/readyness.jsdiffbeforeafterboth
before · tests/scripts/readyness.js
1const { ApiPromise, WsProvider } = require('@polkadot/api');23const connect = async () => {4  const wsEndpoint = 'ws://127.0.0.1:9944'5  const api = new ApiPromise({provider: new WsProvider(wsEndpoint)});6  await api.isReadyOrError;78  const head = (await api.rpc.chain.getHeader()).number.toNumber();9  if(head < 1) throw Error('No block #1');1011  await api.disconnect();12}1314const sleep = time => {15    return new Promise(resolve => {16        setTimeout(() => resolve(), time);17    });18}1920const main = async () => {21  while(true) {22    try {23      await connect();24      break;25    }26    catch(e) {27      await sleep(10000);28    }29  }30}3132main().then(() => process.exit(0)).catch(e => {33  console.error(e);34  process.exit(1);35});
after · tests/scripts/readyness.js
1const { ApiPromise, WsProvider } = require('@polkadot/api');23const connect = async () => {4  const wsEndpoint = 'ws://127.0.0.1:9944'5  const api = new ApiPromise({provider: new WsProvider(wsEndpoint)});6  await api.isReadyOrError;78  const head = (await api.rpc.chain.getHeader()).number.toNumber();9  await api.disconnect();10  if(head < 1) throw Error('No block #1');1112}1314const sleep = time => {15    return new Promise(resolve => {16        setTimeout(() => resolve(), time);17    });18}1920const main = async () => {21  while(true) {22    try {23      await connect();24      break;25    }26    catch(e) {27      await sleep(10000);28    }29  }30}3132main().then(() => process.exit(0)).catch(e => {33  console.error(e);34  process.exit(1);35});